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

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