Revert i686 mkspec file
Revert x86_64 changes except X11R7 path