Merge llvm trunk r321017 to contrib/llvm.
Merge llvm, clang, lld, lldb, compiler-rt and libc++ r302069, and updatebuild glue (preliminary, not all option combinations work yet).
Update llvm to trunk r290819 and resolve conflicts.