CB-7579 Fix run script's ability to use non-arch-specific APKs