Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 2ce4f4b476 am: 7aef4d7a59 am: 8af04a6a47 am: 3252cded4b

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

Change-Id: I9411de8a9ac10f8e80fac0557c1661ca92c93bb9