Merge "Store OatDexFile instead of OatFile in DexFile."