egl/x11: Merge the right version of Frederiks change