Merge "simpleperf: fix showing a misleading msg." am: 284f5b9611
am: 66d2a889bb

Change-Id: I0a5fa52b4ef65eeef4436877925f28fc92fdc1b9