Merge "Must use libdexfile_support_static in a static executable."