Merge "Update TEST_MAPPING to include CtsMediaEncoderTestCases"