Merge "Fix EGLUtils::selectConfigForPixelFormat()"