Merge "simpleperf: make atest happy."
am: 14638b2b85

Change-Id: I706c9de6d8f0f2d981e2764cba8d031c97bd1180