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

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

Change-Id: If56eef7b3166c4ccd5e292ee199506d0e3d539da