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

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

Change-Id: Id9ed0d6973b253a644f87e0cf4457a6621089f6e