DO NOT MERGE Remove MSAA wide line derivate tests

Very manual cherry-pick of 8527bea8e1f99ab1a501cb074ca599b91ad88baa

Bug: 25852424
Bug: 22180525
Change-Id: I66071a423dfe8b9a218c525290b54233c4640109
diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml
index a57fa7d..6f0ac28 100644
--- a/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@ -4472,9 +4472,6 @@
 <Test name="lines_4_samples_dfdx" />
 <Test name="lines_4_samples_dfdy" />
 <Test name="lines_4_samples_fwidth" />
-<Test name="wide_lines_4_samples_dfdx" />
-<Test name="wide_lines_4_samples_dfdy" />
-<Test name="wide_lines_4_samples_fwidth" />
 <Test name="points_4_samples_dfdx" />
 <Test name="points_4_samples_dfdy" />
 <Test name="points_4_samples_fwidth" />
@@ -4487,9 +4484,6 @@
 <Test name="lines_8_samples_dfdx" />
 <Test name="lines_8_samples_dfdy" />
 <Test name="lines_8_samples_fwidth" />
-<Test name="wide_lines_8_samples_dfdx" />
-<Test name="wide_lines_8_samples_dfdy" />
-<Test name="wide_lines_8_samples_fwidth" />
 <Test name="points_8_samples_dfdx" />
 <Test name="points_8_samples_dfdy" />
 <Test name="points_8_samples_fwidth" />
@@ -4502,9 +4496,6 @@
 <Test name="lines_max_samples_dfdx" />
 <Test name="lines_max_samples_dfdy" />
 <Test name="lines_max_samples_fwidth" />
-<Test name="wide_lines_max_samples_dfdx" />
-<Test name="wide_lines_max_samples_dfdy" />
-<Test name="wide_lines_max_samples_fwidth" />
 <Test name="points_max_samples_dfdx" />
 <Test name="points_max_samples_dfdy" />
 <Test name="points_max_samples_fwidth" />
diff --git a/android/cts/es31-lmp-mr1.txt b/android/cts/es31-lmp-mr1.txt
index 86ef4e1..a91e79e 100644
--- a/android/cts/es31-lmp-mr1.txt
+++ b/android/cts/es31-lmp-mr1.txt
@@ -3760,9 +3760,6 @@
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_4_samples_dfdx
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_4_samples_dfdy
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_4_samples_fwidth
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_4_samples_dfdx
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_4_samples_dfdy
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_4_samples_fwidth
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_4_samples_dfdx
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_4_samples_dfdy
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_4_samples_fwidth
@@ -3775,9 +3772,6 @@
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_8_samples_dfdx
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_8_samples_dfdy
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_8_samples_fwidth
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_8_samples_dfdx
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_8_samples_dfdy
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_8_samples_fwidth
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_8_samples_dfdx
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_8_samples_dfdy
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_8_samples_fwidth
@@ -3790,9 +3784,6 @@
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_max_samples_dfdx
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_max_samples_dfdy
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.lines_max_samples_fwidth
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_max_samples_dfdx
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_max_samples_dfdy
-dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_lines_max_samples_fwidth
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_max_samples_dfdx
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_max_samples_dfdy
 dEQP-GLES31.functional.shaders.helper_invocation.derivate.points_max_samples_fwidth