(cherry picked from commit d2b768890f0878ae4e3fec8f7219e82b79256133)
Imported changes from xorg-server-1.2-apple to make master more current wrt file layout, build system changes, and dead code removal.