--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -2792,17 +2792,18 @@ skip-if = (os == 'android' && android_ve
 fail-if = (os == 'b2g')
 [generated/test_conformance__misc__functions-returning-strings.html]
 [generated/test_conformance__misc__instanceof-test.html]
 [generated/test_conformance__misc__invalid-passed-params.html]
 skip-if = (os == 'android') || (os == 'linux')
 [generated/test_conformance__misc__is-object.html]
 [generated/test_conformance__misc__null-object-behaviour.html]
 [generated/test_conformance__misc__object-deletion-behaviour.html]
-fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
+skip-if = (os == 'android' && debug)
+fail-if = (os == 'android')
 [generated/test_conformance__misc__shader-precision-format.html]
 skip-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__misc__type-conversion-test.html]
 skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 fail-if = (os == 'linux')
 [generated/test_conformance__misc__uninitialized-test.html]
 skip-if = (os == 'android')
 [generated/test_conformance__misc__webgl-specific.html]
@@ -2811,16 +2812,17 @@ skip-if = (os == 'android')
 [generated/test_conformance__more__conformance__methods.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-A.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-B1.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-B2.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-B3.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-B4.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-C.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-D_G.html]
+skip-if = (os == 'android' && debug)
 [generated/test_conformance__more__conformance__quickCheckAPI-G_I.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-L_S.html]
 [generated/test_conformance__more__conformance__quickCheckAPI-S_V.html]
 [generated/test_conformance__more__conformance__webGLArrays.html]
 skip-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__more__functions__bindBuffer.html]
 [generated/test_conformance__more__functions__bindBufferBadArgs.html]
 [generated/test_conformance__more__functions__bindFramebufferLeaveNonZero.html]
@@ -3136,29 +3138,34 @@ skip-if = (os == 'android') || (os == 'l
 [generated/test_conformance__textures__texture-complete.html]
 [generated/test_conformance__textures__texture-copying-feedback-loops.html]
 fail-if = 1
 [generated/test_conformance__textures__texture-draw-with-2d-and-cube.html]
 [generated/test_conformance__textures__texture-fakeblack.html]
 [generated/test_conformance__textures__texture-formats-test.html]
 [generated/test_conformance__textures__texture-hd-dpi.html]
 [generated/test_conformance__textures__texture-mips.html]
+skip-if = (os == 'android' && debug)
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-npot-video.html]
 skip-if = 1
 [generated/test_conformance__textures__texture-npot.html]
-fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
+skip-if = (os == 'android' && debug)
+fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-size-cube-maps.html]
+skip-if = (os == 'android' && debug)
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-size-limit.html]
 skip-if = (os == 'android') || (os == 'linux' && asan && e10s)
 fail-if = (os == 'linux')
 [generated/test_conformance__textures__texture-size.html]
+skip-if = (os == 'android' && debug)
 fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g')
 [generated/test_conformance__textures__texture-sub-image-cube-maps.html]
+skip-if = (os == 'android' && debug)
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-transparent-pixels-initialized.html]
 skip-if = 1
 [generated/test_conformance__textures__texture-upload-cube-maps.html]
 [generated/test_conformance__textures__texture-upload-size.html]
 skip-if = 1
 [generated/test_conformance__typedarrays__array-buffer-crash.html]
 [generated/test_conformance__typedarrays__array-buffer-view-crash.html]

--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -113,23 +113,29 @@ skip-if = ((os == 'linux') && asan)
 
 [generated/test_conformance__misc__type-conversion-test.html]
 fail-if = (os == 'linux')
 # Resets device on Android 2.3.
 # Crashes on B2G ICS Emulator, desktop Linux, and Mulet Linux x64.
 skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 
 [generated/test_conformance__misc__object-deletion-behaviour.html]
-fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
+fail-if = (os == 'android')
+# void mozilla::gl::GLContext::fDetachShader(GLuint, GLuint): Generated unexpected GL_INVALID_VALUE error. (0x0501)
+skip-if = (os == 'android' && debug)
 
 [generated/test_conformance__textures__texture-npot.html]
-fail-if = (os == 'android' && (android_version == '10' || android_version == '18')) || (os == 'b2g')
+fail-if = (os == 'android')
+# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500)
+skip-if = (os == 'android' && debug)
 
 [generated/test_conformance__textures__texture-size.html]
 fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g')
+# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500)
+skip-if = (os == 'android' && debug)
 
 ########################################################################
 # "tst-linux{32,64}-spot-NNN" Slaves:
 #   Android 2.3, B2G Emu, Linux, and Mulet.
 # Android: os == 'android'. (Not enough info to separate out 2.3)
 # B2G Emu: os == 'b2g'.
 # Linux: os == 'linux'.
 # Mulet: os == 'b2g' && buildapp == 'mulet'.
@@ -181,29 +187,35 @@ fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-half-float-with-image.html]
 fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-half-float-with-image-data.html]
 fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-half-float-with-video.html]
 fail-if = (os == 'android')
 [generated/test_conformance__textures__texture-mips.html]
 fail-if = (os == 'android')
+# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500)
+skip-if = (os == 'android' && debug)
 [generated/test_conformance__textures__texture-size-cube-maps.html]
 fail-if = (os == 'android')
+# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500)
+skip-if = (os == 'android' && debug)
 [generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgb565.html]
 fail-if = (os == 'android')
 [generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgba4444.html]
 fail-if = (os == 'android')
 [generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgba5551.html]
 fail-if = (os == 'android')
 [generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video.html]
 fail-if = (os == 'android')
 
 [generated/test_conformance__textures__texture-sub-image-cube-maps.html]
 fail-if = (os == 'android')
+# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500)
+skip-if = (os == 'android' && debug)
 
 [generated/test_conformance__canvas__buffer-offscreen-test.html]
 # Causes frequent *blues*: "DMError: Remote Device Error: unable to
 # connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
 skip-if = (os == 'android' && android_version == '10')
 
 [generated/test_conformance__canvas__rapid-resizing.html]
 # Frequent orange crash.
@@ -265,16 +277,19 @@ skip-if = (os == 'android')
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__rendering__framebuffer-texture-switch.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__bugs__array-of-struct-with-int-first-position.html]
 # Crashes
 skip-if = (os == 'android')
+[generated/test_conformance__more__conformance__quickCheckAPI-D_G.html]
+# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500)
+skip-if = (os == 'android' && debug)
 
 ####################
 # 2.3 failures
 [generated/test_conformance__glsl__misc__re-compile-re-link.html]
 fail-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__programs__program-test.html]
 fail-if = (os == 'android' && android_version == '10')