Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86 am: c0754c6f0d am: 1305884494

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12628921

Change-Id: Id0e75eeace4e6eab707e9fa178b1dbc83a712a6d