Merge "simpleperf: fix scripts."
am: 1ed0c279d8

Change-Id: I0a3586b66f4e07731478e94676d3bed14f126533