Merge pull request #923 from dart-lang/fix-windows

Fix test failures on Windows.