am 7f758228: Merge "Fix dex2oat cross-compilation."

* commit '7f758228f7904d2f65f06bfbd2b8ecbb8e8c6a9d':
  Fix dex2oat cross-compilation.