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

Change-Id: I76594d98ed2bba06bfc1953e2d36396eecbec7f7