Merge "Disable record_cmd#record_native_app for non-native ABIs" am: 4259161a39 am: fd2846e895

Change-Id: I5e9763eee65c58f5336a966baa5872b26e8224bb