Merge "Prune CtsSkQPTestCases out of general-tests."