am 055fb15e: Merge "Use the correct HOST_ARCH for oat files."

* commit '055fb15e980347d7975d8f88c531b752c0f9b316':
  Use the correct HOST_ARCH for oat files.