CB-3445: Allow build and run scripts to select APK by architecture