Re-apply r197076 and r197086; the build was fixed by chapuni in r197114.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197116 91177308-0d34-0410-b5e6-96231b3b80d8