Merge "simpleperf: fix presubmit test failure." am: c9ada9f419 am: 0f36d05bf3

Change-Id: I807deb777cbd4e940dfafbb4e40017bf679c0c45