Merge "New CTS test type for GLES tests"