Merge "Opengl: fix a type for GraphicsEnvironment"