am b2d4768e: Merge "Store OatDexFile instead of OatFile in DexFile."

* commit 'b2d4768e4adc6d880d2e17c5cf4293639c8adab7':
  Store OatDexFile instead of OatFile in DexFile.