Merge "simpleperf: fix runtest." am: 2b29c4cea0 am: 3b7f9eac6f am: a402822d94
am: 05c7b60c62

Change-Id: I1ff580958db07ec02c0b98100ac8eabc5418c679