Un-revert r164907 and r164902 (+ follow-ups), 10.6 build fix to follow.

llvm-svn: 165988
11 files changed