Merge "Add CompactDexFile"