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

Change-Id: I76c05393b6e779e8e58601abbbbd3d5ac6ee3833