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

Change-Id: I330a053333edb0d2b686d6dd1a63147951d614cf