Merge llvm trunk r321017 to contrib/llvm.
Update llvm to trunk r290819 and resolve conflicts.
Update llvm to trunk r256633.