Merge "Fix CTS crash from DexFile refactoring"