Merge "simpleperf: improve generating test files." am: d0655ccfbe

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

Change-Id: I96e50d29fba13c142a5034b5cb67b9e412e8f3e6