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

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

Change-Id: Ic9823295d27682a0d1aee0c77a7ce8fc75e9afc4