Merge "simpleperf: simplify packing script zip file." am: a4c64e2f92

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

Change-Id: I21cef1a46c2be7a3ffc0ff6dcbc838cdc806e052