am d8e08ffe: am 5852efcb: am bbf02afc: Merge "Do not look for prebuilts on architectures other than Arm."

* commit 'd8e08ffee53ee0cb0bf0309f7ea06e3df704587e':
  Do not look for prebuilts on architectures other than Arm.