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

* commit 'cf1b7d4b2879f856c831587b52f17063da6af158':
  Select src arch for prebuilts.