Merge "simpleperf: fix time report in report_sample.py." am: 06d7e3a4e2
am: f5187fc0ae

Change-Id: Ic47db979db0d0d838107c7b2fd44e00202dd0770