Merge "Prune CtsSkQPTestCases out of general-tests." am: 24b2f8daf5

Change-Id: Id43582bfd0bad86e2e3f5946c894e657d3dfd5c9