Merge llvm trunk r300422 and resolve conflicts.

Update Makefiles and other build glue for llvm/clang 3.7.0, as of trunk
r239412.

Upgrade our copy of llvm/clang to r126079, from upstream's trunk.

This contains many improvements, primarily better C++ support, an
integrated assembler for x86 and support for -pg.