Merge llvm, clang, lld, lldb, compiler-rt and libc++ r307894, and updatebuild glue.
Update llvm to trunk r290819 and resolve conflicts.