Merge llvm, clang, lld, lldb, compiler-rt and libc++ r306956, and updatebuild glue.
Merge llvm trunk r300422 and resolve conflicts.