Merge "simpleperf: fix scripts on windows." am: f942f9570e
am: 28d4877ea3

Change-Id: I6659ed5808f4c4a79efa3db8b40a6a8767712bf6