Merge "simpleperf: fix report_sample_test." am: 7b615cfb00
am: 8376ac2f2e

Change-Id: I5507a4c0d85e27576c2746ddf855426d684274d6