Merge llvm trunk r321017 to contrib/llvm.
Update llvm to trunk r290819 and resolve conflicts.
Update Makefiles and other build glue for llvm/clang 3.7.0, as of trunkr239412.
Merge llvm trunk r238337 from ^/vendor/llvm/dist, resolve conflicts, andpreserve our customizations, where necessary.