Merge "Fix CtsAppCompatHostTestCases name in TEST_MAPPING"