[automerger skipped] simpleperf: improve managing temp files.
am: 6f14272775  -s ours

Change-Id: I3b1ed2c98098f97331a30df6f52def639b507098