fix for ARM alias changes
cherrypick build.sh ARM alias changes
Source for buildrump.sh git rev cacb88b0d8a6511a0501e7bd7cb67882c68a64dc