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

Change-Id: Ie63b796db5f6b20159eb26e8dd6eadae8f7afece