Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift
Conflicts:
tools/libclang/libclang.exports
unittests/libclang/LibclangTest.cpp
apple-llvm-split-commit: e3e28d2c1aa9119ae9546c880bafff724a64375c
apple-llvm-split-dir: clang/