Merge "Add CompactDexFile"
am: dfce43569a

Change-Id: I954fa04e82275547a3ab34690ffc8962fc5f86f9