[automerger skipped] Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86 am: c0754c6f0d am: 1305884494 am: b3242e04d1 -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: Ifd8c028eb6f5dce6034384c4df9c39e70ea9e154