Merge "Add CompactDexFile" am: dfce43569a am: 228f1ea291
am: fcd547b28b

Change-Id: I0055b92bf099a0c8c60dadb69d341f43949ee40c