Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d58dba651

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

Change-Id: Ic9cde076ce355156ecfe8e91a71c62415e0a3454