Replace xorg-autogen.patch with xorg-autogen-merged.patch