Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5fbe2e30e am: f4ae804b8d am: c3f69300df am: 17362a02d8

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

Change-Id: Iadda7543781478bf798f9e10d197b19c5790e00e