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

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

Change-Id: I7d6c52da4900b224454fb4d4ea078b56a3f40d52