Merge "simpleperf: fix scripts." am: b8d696603f am: 140681ec0c

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

Change-Id: I3df1116928a50d55b2a2738bd6a8c7de895c0219