No bug - Fix --disable-threadsafe shell builds to unbreak JS fuzzers. r=jorendorff,jonco, a=Tomcat
Bug 1031097 - Skip more webgl-conformance tests on Android 2.3. a=bustage-fix
Merge m-c to inbound. a=merge