Merge "regenerate egl/gles stubs from glgen"