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

Change-Id: I94be6d4295f3b464561142370ad9383e3d6d8ac0