GOOD Merge commit '3290b08b017325f8e903c889ae796fce48d6e467' into embedlite_upgrade_3290b08b017325f8e903c889ae796fce48d6e467.

Conflicts:
	gfx/gl/GLContextProviderGLX.cpp
Merge commit '8424078a2dea4dc3d19f3e5400810a093b236de9' into embedlite_upgrade_8424078a2dea4dc3d19f3e5400810a093b236de9.
Scrolling jumps (UpdateScrollOffset removal consequences)
Fixed js stack assertion
Merge commit '3b7de5fbc9ea70b7dcd1e2f57c4551d75c715f15' into embedlite_upgrade_3b7de5fbc9ea70b7dcd1e2f57c4551d75c715f15 - ?
Merge commit 'bc921317ec3b2ac24508940cc08dc48de49af041' into embedlite_upgrade_bc921317ec3b2ac24508940cc08dc48de49af041
Merge commit 'dc04e7c0902c68ea481d3672557b9bae44414e50' into embedlite_upgrade_bc921317ec3b2ac24508940cc08dc48de49af041  good
Merge commit 'bb8738a7254f231ac6957838bbdccba652d2db1e' into embedlite_upgrade_bb8738a7254f231ac6957838bbdccba652d2db1e. good
Temporary return updateScrollOffset API
Apply fix from bug 949132
Remove UpdateScrollOffset completely
Fixed build on non-X11 platform
Sync TabChildHelper.cpp with TabChild.cpp
Merge branch 'embedlite' into embedlite_upgrade_22ef961b401b95256123f9c032381241f31d8e59

Conflicts:
	embedding/embedlite/tests/moz.build
	gfx/gl/GLContextProviderGLX.cpp
	js/src/jit/MoveResolver.h