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

Change-Id: Ia7da066924d85e6e813ff99f623babe60b940dfe