Merge "Remove the CtsOsTestCases in the test mapping file"