swift234

Revert r8705, r8706, r8722.

The first one broke the	ninja build, while the third one fixed the
ninja build but broke the makefile build. CMake portability FTW.

I really want us to get	r8705/r8706, but we need all of
Xcode/Ninja/Makefiles to build properly.



Swift SVN r8725