Merge "simpleperf: add runtest in simpleperf_script.zip." am: 9ad0077a1b am: 139bc61bf2

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

Change-Id: Ic03ce64880883126189f6f966031b2860000ca7e