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

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

Change-Id: Ib8cb49ccc88c2786d239b7acee0f890f6d4e2cd9