--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -91,24 +91,26 @@ skip-if = (os == 'b2g') || (os == 'linux
 
 [generated/test_conformance__extensions__webgl-draw-buffers.html]
 fail-if = (os == 'mac')
 # Crashes
 skip-if = (os == 'linux')
 
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec3.html]
 # Crashes from libglsl.so
-skip-if = (os == 'linux') || os == 'mac')
+# application crashed [@ jemalloc_crash] on Android
+skip-if = (os == 'linux') || (os == 'mac') || (os == 'android')
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec4.html]
 # application crashed [@ ParseOperand::GetLogicalSize() const + 0x4]
-skip-if = (os == 'linux') || os == 'mac')
+skip-if = (os == 'linux') || (os == 'mac') || (os == 'android')
 
 [generated/test_conformance__glsl__constructors__glsl-construct-ivec3.html]
 # application crashed [@ ParseOperand::GetLogicalSize() const + 0x4]
-skip-if = (os == 'linux') || (os == 'mac')
+# application crashed [@ jemalloc_crash] on Android
+skip-if = (os == 'linux') || (os == 'mac') || (os == 'android')
 [generated/test_conformance__glsl__constructors__glsl-construct-ivec4.html]
 # Assume crashes like ivec3
 skip-if = (os == 'linux') || (os == 'mac')
 
 [generated/test_conformance__glsl__constructors__glsl-construct-mat2.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 # Crashes on Linux ASAN
 skip-if = ((os == 'linux') && asan)
@@ -127,28 +129,28 @@ skip-if = (os == 'android' && debug)
 [generated/test_2_conformance2__textures__misc__tex-mipmap-levels.html]
 fail-if = (os == 'mac')
 skip-if = (os == 'win')
 
 [generated/test_conformance__extensions__oes-vertex-array-object.html]
 # 10.6 crash:
 # PROCESS-CRASH | dom/canvas/test/webgl-conf/generated/test_conformance__extensions__oes-vertex-array-object.html | application crashed [@ gleRunVertexSubmitImmediate + 0xf24]
 skip-if = (os == 'mac' && os_version == '10.6')
-fail-if = (os == 'win') || (os == 'mac')
+fail-if = (os == 'win') || (os == 'mac') || (os == 'android') || (os == 'linux')
 
 [generated/test_2_conformance__textures__misc__cube-incomplete-fbo.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__instanceof-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-image-with-invalid-data.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__textures__misc__texture-copying-feedback-loops.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'win') || (os == 'mac') || (os == 'android') || (os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-unpack-params.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__samplers__sampler-drawing-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-type-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
@@ -168,23 +170,23 @@ fail-if = (os == 'mac') || (os == 'win')
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-copying-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__glsl3__forbidden-operators.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__buffers__buffer-data-and-buffer-sub-data.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__textures__misc__tex-sub-image-2d-bad-args.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
 [generated/test_2_conformance2__vertex_arrays__vertex-array-object.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__rendering__negative-one-index.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__extensions__oes-texture-half-float.html]
-fail-if = (os == 'mac') || (os == 'win') || (os == 'android')
+fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
 [generated/test_2_conformance__renderbuffers__feedback-loop.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-copying-contents.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__reading__read-pixels-pack-parameters.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__attribs__gl-vertexattribpointer.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
@@ -195,19 +197,24 @@ fail-if = (os == 'win')
 # Assertion: ""GFX: We should have caught all other errors"" in WebGLTextureUpload.cpp#
 skip-if = (os == 'mac')
 [generated/test_2_conformance__glsl__misc__shaders-with-invariance.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-sub-image-2d-bad-args.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__expando-loss-2.html]
 fail-if = (os == 'mac') || (os == 'win')
-
+[generated/test_conformance__ogles__GL__biuDepthRange__biuDepthRange_001_to_002.html]
+fail-if = (os == 'android') || (os == 'linux')
+[generated/test_conformance__ogles__GL__gl_FragCoord__gl_FragCoord_001_to_003.html]
+fail-if = (os == 'android') || (os == 'linux')
 
-
+[generated/test_conformance__textures__misc__texture-size-limit.html]
+fail-if = (os == 'linux') || (os == 'android')
+skip-if = (os == 'linux' && asan)
 [generated/test_2_conformance2__textures__canvas__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
 skip-if = (os == 'mac' && debug)
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__textures__canvas__tex-2d-rgb9_e5-rgb-half_float.html]
 skip-if = (os == 'mac' && debug)
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__reading__read-pixels-from-fbo-test.html]
 skip-if = (os == 'mac') || (os == 'win')
@@ -222,24 +229,35 @@ skip-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__state__gl-object-get-calls.html]
 # Hit MOZ_GL_DEBUG_ABORT_ON_ERROR on debug build
 skip-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__misc__bad-arguments-test.html]
 # skip because some result logged after SimpleTest.finish()
 skip-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__misc__bad-arguments-test.html]
 # skip because some result logged after SimpleTest.finish()
-skip-if = (os == 'mac') || (os == 'win')
+skip-if = (os == 'mac') || (os == 'win') || (os == 'linux') || (os == 'android')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec-mat-index.html]
 # skip this test because finish() was called multiple times
-skip-if = (os == 'mac') || (os == 'win')
+skip-if = (os == 'mac') || (os == 'win') || (os == 'linux') || (os == 'android')
 [generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-index.html]
 # skip this test because finish() was called multiple times
-skip-if = (os == 'mac') || (os == 'win')
-
+skip-if = (os == 'mac') || (os == 'win') || (os == 'linux') || (os == 'android')
+[generated/test_conformance__textures__misc__cube-incomplete-fbo.html]
+fail-if = (os == 'mac') || (os == 'linux')
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__sampler-struct-function-arg.html]
+# Crashes
+skip-if = (os == 'linux') || (os == 'android')
+[generated/test_conformance__glsl__constructors__glsl-construct-bvec2.html]
+# mozalloc_abort in libglsl.so
+skip-if = (os == 'linux') || (os == 'android')
+[generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html]
+fail-if = (os == 'win')
+skip-if = (os == 'android')
 ########################################################################
 # "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'.
 [generated/test_conformance__glsl__bugs__temp-expressions-should-not-crash.html]
@@ -254,16 +272,20 @@ fail-if = (os == 'android') || (os == 'l
 [generated/test_conformance__ogles__GL__sin__sin_001_to_006.html]
 fail-if = (os == 'android') || (os == 'linux')
 [generated/test_conformance__reading__read-pixels-test.html]
 # Causes consistent *blues*: "DMError: Remote Device Error: unable to
 # connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
 # Crashes near on B2G ICS Emulator.
 skip-if = (os == 'android') || (os == 'linux')
 fail-if = (os == 'mac') || (os == 'win')
+[generated/test_conformance__textures__misc__texture-upload-size.html]
+# application crashed [@ mozilla::WebGLTexture::TexSubImage]
+skip-if = (os == 'win' && debug) || (os == 'android')
+fail-if =(os == 'win')
 
 ########################################################################
 ########################################################################
 # Android
 
 [generated/test_conformance__attribs__gl-disabled-vertex-attrib.html]
 fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-float.html]
@@ -283,30 +305,44 @@ fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-half-float-with-canvas.html]
 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__video__tex-2d-rgb-rgb-unsigned_byte.html]
+fail-if = (os == 'android')
+[generated/test_conformance__textures__video__tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
+fail-if = (os == 'android')
+[generated/test_conformance__textures__video__tex-2d-rgba-rgba-unsigned_byte.html]
+fail-if = (os == 'android')
 
+[generated/test_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
+# timed out crash
+skip-if = (os == 'android')
+[generated/test_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
+# timed out
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__texture-size.html]
+# application crashed [@ mozilla::gl::GLContext::AfterGLCall]
+skip-if = (os == 'android')
 [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.
 skip-if = (os == 'android')
 
 [generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html]
 # Crashes sometimes
 skip-if = (os == 'android')
-
 [generated/test_conformance__canvas__drawingbuffer-hd-dpi-test.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__context__context-creation.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__context__context-eviction-with-garbage-collection.html]
 # Crashes
@@ -348,25 +384,78 @@ 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)
-
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__texture-size-cube-maps.html]
+# application crashed [@ mozilla::gl::GLContext::AfterGLCall]
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__texture-mips.html]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__logic-inside-block-without-braces.html]
+# application crashed [@ MustSkipMarking<JSObject*>]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__gl-fragcoord-multisampling-bug.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__samplers__glsl-function-texture2dprojlod.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__compare-loop-index-to-uniform.html]
+skip-if = (os == 'android')
+[generated/test_conformance__misc__boolean-argument-conversion.html]
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__texture-npot.html]
+# application crashed [@ mozilla::gl::GLContext::AfterGLCall]
+skip-if = (os == 'android')
+[generated/test_conformance__misc__shader-precision-format.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__tex-image-webgl.html]
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__gl-teximage.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__sequence-operator-evaluation-order.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__fragcoord-linking-bug.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__texture-sub-image-cube-maps.html]
+# application crashed [@ mozilla::gl::GLContext::AfterGLCall]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__struct-constructor-highp-bug.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__variables__glsl-built-ins.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__nested-loops-with-break-and-continue.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__qualcomm-crash.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__bugs__uniforms-should-not-lose-values.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
 ####################
 # 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')
-
+[generated/test_conformance__textures__misc__tex-image-with-invalid-data.html]
+skip-if = (os == 'android')
 ####################
 # Timeouts
 [generated/test_conformance__context__context-release-upon-reload.html]
 skip-if = (os == 'android')
 [generated/test_conformance__context__context-release-with-workers.html]
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
 skip-if = (os == 'android')
@@ -377,18 +466,16 @@ skip-if = (os == 'android')
 fail-if = (os == 'android')
 # (TODO) Generates results after calling finish()
 skip-if = 1
 
 ####################
 # Timeout on 2.3
 [generated/test_conformance__misc__delayed-drawing.html]
 skip-if = (os == 'android' && android_version == '10')
-[generated/test_conformance__misc__shader-precision-format.html]
-skip-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__more__conformance__webGLArrays.html]
 skip-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__more__functions__bufferData.html]
 skip-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__more__functions__bufferDataBadArgs.html]
 skip-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__more__functions__bufferSubData.html]
 skip-if = (os == 'android' && android_version == '10')
@@ -413,23 +500,16 @@ skip-if = (os == 'android')
 skip-if = (os == 'android')
 [generated/test_conformance__misc__uninitialized-test.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__renderbuffers__framebuffer-object-attachment.html]
 # Crashes
 skip-if = (os == 'android')
 
-####################
-
-####################
-# Crashes on android 2.3 slaves
-[generated/test_conformance__glsl__bugs__compare-loop-index-to-uniform.html]
-skip-if = (os == 'android' && android_version == '10')
-
 ########################################################################
 ########################################################################
 # B2G
 [generated/test_conformance__glsl__reserved___webgl_function.vert.html]
 fail-if = (os == 'b2g')
 [generated/test_conformance__glsl__reserved__webgl_function.vert.html]
 fail-if = (os == 'b2g')
 [generated/test_conformance__misc__error-reporting.html]
@@ -438,19 +518,16 @@ fail-if = (os == 'b2g')
 fail-if = (os == 'b2g')
 
 
 ########################################################################
 ########################################################################
 # Linux
 [generated/test_conformance__attribs__gl-vertex-attrib-render.html]
 fail-if = (os == 'linux')
-[generated/test_conformance__glsl__constructors__glsl-construct-bvec2.html]
-# mozalloc_abort in libglsl.so
-skip-if = (os == 'linux')
 [generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
 # mozalloc_abort in libglsl.so
 skip-if = (os == 'linux')
 [generated/test_conformance__glsl__constructors__glsl-construct-vec3.html]
 # Crashes
 skip-if = (os == 'linux')
 [generated/test_conformance__glsl__constructors__glsl-construct-vec4.html]
 # Inferred crash from vec3 above.
@@ -535,18 +612,16 @@ fail-if = (os == 'mac')
 [generated/test_2_conformance2__textures__video__tex-2d-srgb8-rgb-unsigned_byte.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance2__textures__video__tex-2d-rgba8-rgba-unsigned_byte.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance__glsl__variables__gl-pointcoord.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance2__textures__video__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
 fail-if = (os == 'mac')
-[generated/test_conformance__textures__misc__cube-incomplete-fbo.html]
-fail-if = (os == 'mac')
 [generated/test_2_conformance2__textures__video__tex-2d-rgb8-rgb-unsigned_byte.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance2__state__gl-get-calls.html]
 fail-if = (os == 'mac')
 [generated/test_conformance__extensions__angle-instanced-arrays.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance__rendering__point-size.html]
 fail-if = (os == 'mac')
@@ -615,20 +690,16 @@ fail-if = (os == 'win' && os_version == 
 # Crashes on D3D11 debug.
 skip-if = (os == 'win' && os_version != '5.1')
 [generated/test_2_conformance2__glsl3__uniform-location-length-limits.html]
 # time out crash
 skip-if = (os == 'win' && debug)
 [generated/test_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
 # time out crash
 skip-if = (os == 'win' && debug)
-[generated/test_conformance__textures__misc__texture-upload-size.html]
-# application crashed [@ mozilla::WebGLTexture::TexSubImage]
-skip-if = (os == 'win' && debug)
-fail-if =(os == 'win')
 [generated/test_conformance__extensions__webgl-compressed-texture-size-limit.html]
 # skip this because the result is not always pass
 skip-if = (os == 'win')
 [generated/test_2_conformance2__glsl3__loops-with-side-effects.html]
 # application crashed [@ nvoglv32.dll + 0x999512]
 skip-if = (os == 'win')
 [generated/test_2_conformance2__attribs__gl-vertex-attrib-i-render.html]
 # timed out crash
@@ -814,10 +885,8 @@ fail-if = (os == 'win')
 [generated/test_2_conformance2__textures__image__tex-2d-rgba4-rgba-unsigned_byte.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__textures__image__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__textures__image__tex-2d-rgb8-rgb-unsigned_byte.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__textures__canvas__tex-2d-rg16f-rg-half_float.html]
 fail-if = (os == 'win')
-[generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html]
-fail-if = (os == 'win')