Merge "simpleperf: fix report_sample_test." into oreo-cts-dev