CB-7554 Use x86 apk when deploying to an intel device / emulator