Windows build tracks llvm trunk again