Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95

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

Change-Id: I3f420981005eb07b0f522a48e9054461d0317b64