Revert 185521
Relanding the original change and rolling skia back to 7909.

> Revert 185332
> Speculative revert.  All the GPU bots are currently red, failing at the compile stage.
> This time also reverting the skia roll even though a more recent version had been rolled.
> 
> > Update khronos GLES2/gl2.h header
> > 
> > BUG=178589
> > 
> > Review URL: https://codereview.chromium.org/12313140
> 
> TBR=phajdan.jr@chromium.org
> Review URL: https://codereview.chromium.org/12383047

TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/12381037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185530 0039d316-1c4b-4281-b951-d872f2087c98
14 files changed