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

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

Change-Id: Ida542ed3d3d790bb05fa11e78d142338b35ff503