update 2d for skia update
update skia-npapi for skia update
Update Skia to rXXXXX
Bug 848491 - Add the glCopyTexSubImage2D and glGenerateMipmap function pointers to our GrGLInterface
Bug 910754 - Add a bunch more required OpenGL functions for SkiaGL when using desktop OpenGL

Conflicts:
	gfx/gl/GLContext.h