Merge "simpleperf: fix scripts based on test on darwin/windows." am: b137bb2c74 am: cc4690506e am: 46157d4a2e
am: 59c3a97af8

Change-Id: Idcfb0123bc1b96e22f3f71d9caa8e9393aedc1bf