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

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