Merge "libbinder: TEST_MAPPING -= rando CtsOsTestCases"