Merge "Must use libdexfile_support_static in a static executable." am: 4cbf095493 am: ccf3f03840
am: 6f8cf30bc8

Change-Id: Iba8f4b7f3d0bf16c5a0b10b1cacc96939b5ef6a5