Merge "simpleperf: fix scripts." am: b8d696603f

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1434193

Change-Id: I8327bd91edd333bded01bd03c7439fab3e49a265