Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 0b25ed32b6 am: 58a838f39e am: 911599c8d1 am: b9beabe71c

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni/+/1912677

Change-Id: I42fbd4511ed7a3150ba0f3acd12d236ec2f821f0