Merge "simpleperf: fix unit test."
am: bee9bac65f

Change-Id: Ic4fd3dd53843d206a2537137049888d1ffb61c01