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

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

Change-Id: Ia64d72d9b28cc15d3add8183e29feb153ae181a8