Merge changes I6a10969a,I84f8fe7a

* changes:
  simpleperf: fix ReportCommandTest on windows.
  simpleperf: fix tests on windows.