am bca6b0c5: am fbc2b174: Merge "Avoid a memory allocation in OatFile::GetOatDexFile()."

* commit 'bca6b0c5c755dce17a037459fe0c3d62d98ffbd4':
  Avoid a memory allocation in OatFile::GetOatDexFile().