Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 88fac7b76f am: dba66ab262

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

Change-Id: I942735aa2e64278263e9f5419a90bb0cb1293413