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

Change-Id: I06059a1830e702f29769e7241c37534ae952396f