[upstream] Remove separate glamor-egl in favour of glamor in xorg-server.