[automerger skipped] Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86 am: c0754c6f0d am: 1305884494 -s ours am: d7c9db7fa3 -s ours

am skip reason: Change-Id I2f0770fe8d406b5a9b8a491a7d87202d2a674d24 with SHA-1 c0754c6f0d is in history

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

Change-Id: Id795c07dcedfff9f1e5de375ee749e49e0e28f9b