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

Change-Id: I385718332e43daa809ed0ceedebabc70c38ffea4