Merge llvm trunk r321017 to contrib/llvm.

Update llvm to trunk r290819 and resolve conflicts.

Upgrade our copy of llvm/clang to 3.3 release.

Release notes are still in the works, these will follow soon.

MFC after: 1 month