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

Change-Id: Ia86c0a163081bb75f82a760d2de0be6e6ee9d69d