Merge "simpleperf: minor fix in report_sample.proto field" am: 4f613859c8
am: c103d16a21

Change-Id: I319e8b42a59ba4a29dd3dedf1d896d5b09244737