Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Manually delete one patch and modify another.

Test: None
Change-Id: I640c202e54e46f97c0a5641169c37645591ca83e
6 files changed