Remove tests affected by bug 20340817 from mustpass.

Bug: 20340817
Change-Id: I969e12761ebdfd323c01dc93901899db9b9b9340
diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index bf19bcf..326374e 100644
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -97692,9 +97692,6 @@
 					<Test name="texture_levels">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="attachment_query_default_fbo">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="attachment_query_empty_fbo">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index bc30f95..635d5e0 100644
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -28671,7 +28671,6 @@
 dEQP-GLES3.functional.fbo.api.invalid_rbo_attachments
 dEQP-GLES3.functional.fbo.api.attach_names
 dEQP-GLES3.functional.fbo.api.texture_levels
-dEQP-GLES3.functional.fbo.api.attachment_query_default_fbo
 dEQP-GLES3.functional.fbo.api.attachment_query_empty_fbo
 dEQP-GLES3.functional.fbo.api.attachment_query_tex2d
 dEQP-GLES3.functional.fbo.api.attachment_query_texcube
diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
index eefa9b4..b190adf 100644
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -84,3 +84,6 @@
 
 # Bug 20092191
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.20
+
+# Bug 20340817
+dEQP-GLES3.functional.fbo.api.attachment_query_default_fbo