Reapply r110396, with fixes to appease the Linux buildbot gods.

llvm-svn: 110460
GitOrigin-RevId: a7aed18624f7783b7c31b06069c43bec89f1813f
213 files changed