Merge "Fix dex2oat/oatdump cross-compilation."
am: 2e89e90

* commit '2e89e901b9f303549f3ba64e45d87292e9c986c8':
  Fix dex2oat/oatdump cross-compilation.