CB-7554 Use x86 apk when deploying to an intel device / emulator
Merge branch 'master' into 4.0.x (x86 deploy)