Conflicts: registry/egl.xml registry/gl.xml The only diff we now have from the source is glUnmapBufferOES()'s alias to normal glUnmapBuffer().