Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d9335dc735 am: ca31734680 am: a9526b2dcc am: 7c531ca545

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

Change-Id: I8cf925856d4f4dc7760a53856590deccde65fec3