Merge "Regenerate GL stubs"