Merge "simpleperf: fix windows test." am: 546a5481f3 am: cef215cf7f

Change-Id: I1976ae87f1f40a11928a9df7da63140adb729956