Update TEST_MAPPING

Run cargo2android to update TEST_MAPPING files with the changes in
aosp/1501997 and aosp/1548356.

Test: TH
Change-Id: I4c89c6b01f82f764b0ffc208d6be7bc7b648d8d6
2 files changed