Merge "Revert "opengl: Regenerate code with ES 3.1 and new extensions""