am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"

* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
  don't use LOCAL_*_arch for host builds