Merge latest clang-as-ios-dylib changes.