Merge "simpleperf: fix report_sample_test." am: 7b615cfb00 am: 8376ac2f2e am: 253c2ad631
am: 569382dd66

Change-Id: I216690062cfdfa7b79c3a5732123fec1609437a5