Add a bunch of missing changes from r203208

Somehow lost these in a git operation.

llvm-svn: 203210
3 files changed