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

Change-Id: Idedcf3bdaff4625de5747523f266534f8a47cc56