Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86 am: c0754c6f0d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12628921 Change-Id: I7f2d4bd688dd294f7f70a9cde0e68b4873241af2