Reinstate commitse5559ca4and925dbc79with changes that avoid the reported failures in Windows builds. Ref: https://github.com/llvm/llvm-project/pull/144960
Reinstate commitse5559ca4and925dbc79with changes that avoid the reported failures in Windows builds. Ref: https://github.com/llvm/llvm-project/pull/144960