am e84bd949: am c74e46a7: Merge "Work around arm64 host prebuilt differences."
am e84bd949: am c74e46a7: Merge "Work around arm64 host prebuilt differences."

* commit 'e84bd94993bb69a883d20f1f94ba247cff39fedf':
  Work around arm64 host prebuilt differences.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst