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

Change-Id: I994794a995a85838f6af6ff389cbc135931996a0