Merge "simpleperf: fix a check error." am: 89bf4d4276 am: a2f8d9cbbd
am: ef26fda84d

Change-Id: I3d349113998b423764d71d489029811a6bf550ba