Revert "Merge latest clang-as-ios-dylib changes."

Reverts facebook/xctool#414