CB-7579 Fix run script's ability to use non-arch-specific APKs
Merge branch 'master' into 4.0.x (fix ant run command)