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

Change-Id: Id16a0bc23af2d336e5709ddc15c13a2e36dcf27a