Merge "simpleperf: improve generating test files."