Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 733e7baa10 am: b07611c07c

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

Change-Id: I9b0a2c012a28ecf0e8260fc4730d40b477b68439