Merge "simpleperf: use file records in protobuf output." am: 2a309ae76b
am: 14a08ae117

Change-Id: I2c4f36f2102a85d5eb07f3a89666e4a25ad5ed09