Merge "simpleperf: fix record file writer." am: 4c54842292
am: f33ea38bf2

Change-Id: I5d4f25b6f0b70491d6e7381ac140ce0744bfde8c