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

Change-Id: I78396b488f169a2856b66739e97d28015d867927