Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 688831757b am: f66d34fbe1 am: 5f84145a59 am: a80fcfc585

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

Change-Id: If64d2b3347873e284f7cf0fe922495fded108c1b