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

* commit '4048cf3a70dd6405f7ff08b8a3d714d1a7b7d446':
  don't use LOCAL_*_arch for host builds