Merge "Perfprofd: Refactor protobuf I/O"
am: c41d048d58

Change-Id: I8a5f99c8881922e437359555afc5234aff0a9c1b