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

Change-Id: I7b34a9f7186ba57805a27bfb53ec38515e94fc5f