Merge "simpleperf: fix some errors testing on windows."