Merge "don't use LOCAL_*_arch for host builds"