Harden the version requirements to the set that actually works after three

days of trying to figure it out. Despite some developer's penchant for
relaxing the tool versions, this just isn't possible. Only certain versions
work with certain other versions.

llvm-svn: 16943