Merge "OpenGL: fix initializeAnglePlatform with built-in ANGLE driver"