Merge "simpleperf: fix simpleperf_unit_test on windows." am: 7c29b190ae
am: 334aee4167

Change-Id: I6c5894dd925123ee14a82e78a7714a5aef428483