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

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

Change-Id: I50dffcbb28155b86cf26147159e35b0f99438455