am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts."

* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
  Select src arch for prebuilts.