Merge "simpleperf: fix a small error." am: 3c7ae46f92 am: 9898014244
am: 64f5ba0557

Change-Id: Ic1e18a5d27fd3542e1545135dbf4a974c4a45491