Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 am: deafa1d498 am: a6afd5ba40 am: ed03940b7c

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417

Change-Id: I71628b50a8ee70e673694d372cb5b0ad62ecbfe4