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

Change-Id: I2be21e68611ff552f9ecc7c3e8fa09a7ea783f85