LLVM upgrades

This is a reopening of #6713

This is still blocked on windows failures. I'll re-push try once the existing crisis has passed.