Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140 am: 2b850fd536 am: 4d3f891433 am: bd8cddb34e

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

Change-Id: I1b3f7254a09e3f29f107e92c8683efe48e602fb9