Merge "Revert "Update TEST_MAPPING to include CtsMediaMiscTestCases""