Remove two EGL tests with flaky results

Remove
dEQP-EGL.functional.multithread.pbuffer_pixmap
dEQP-EGL.functional.multithread.pbuffer_pixmap_context

Bug: 23155891
Change-Id: I6a082814e634e9aad103d714b760877686d23b8f
diff --git a/android/cts/master/com.drawelements.deqp.egl.xml b/android/cts/master/com.drawelements.deqp.egl.xml
index 03a9d16..73784a3 100644
--- a/android/cts/master/com.drawelements.deqp.egl.xml
+++ b/android/cts/master/com.drawelements.deqp.egl.xml
@@ -2438,9 +2438,6 @@
 				<Test name="context">
 					<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 				</Test>
-				<Test name="pbuffer_pixmap">
-					<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-				</Test>
 				<Test name="pixmap_window">
 					<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 				</Test>
@@ -2450,9 +2447,6 @@
 				<Test name="pixmap_context">
 					<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 				</Test>
-				<Test name="pbuffer_pixmap_context">
-					<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-				</Test>
 				<Test name="pixmap_single_window_context">
 					<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 				</Test>
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 846ee5a..1dd14ed 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -743,11 +743,9 @@
 dEQP-EGL.functional.multithread.pixmap
 dEQP-EGL.functional.multithread.single_window
 dEQP-EGL.functional.multithread.context
-dEQP-EGL.functional.multithread.pbuffer_pixmap
 dEQP-EGL.functional.multithread.pixmap_window
 dEQP-EGL.functional.multithread.pixmap_single_window
 dEQP-EGL.functional.multithread.pixmap_context
-dEQP-EGL.functional.multithread.pbuffer_pixmap_context
 dEQP-EGL.functional.multithread.pixmap_single_window_context
 dEQP-EGL.functional.get_proc_address.extension.egl_android_blob_cache
 dEQP-EGL.functional.get_proc_address.extension.egl_android_native_fence_sync
diff --git a/android/cts/master/src/egl-failures.txt b/android/cts/master/src/egl-failures.txt
index f26b251..a301cb5 100644
--- a/android/cts/master/src/egl-failures.txt
+++ b/android/cts/master/src/egl-failures.txt
@@ -518,6 +518,8 @@
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba5_a1_read_pixels
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba5_a1_texture
 dEQP-EGL.functional.multithread.pbuffer_context
+dEQP-EGL.functional.multithread.pbuffer_pixmap
+dEQP-EGL.functional.multithread.pbuffer_pixmap_context
 dEQP-EGL.functional.multithread.pbuffer_pixmap_single_window
 dEQP-EGL.functional.multithread.pbuffer_pixmap_single_window_context
 dEQP-EGL.functional.multithread.pbuffer_pixmap_window