Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888d am: b340e65226 am: e1a246a985

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689

Change-Id: I5f12898e0e630ebb29d239b685cd7779bd08de6e