Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 25295f66de am: 3643ebec31 am: a627d25d8b

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

Change-Id: Iffcb5b9daa0d39ef76202e0a35e646f5f5bcdb7e