Merge "Use the correct HOST_ARCH for oat files."