Merge \"simpleperf: fix runtest.\"
am: b40840ff74

Change-Id: I734ce3ec710c9e8fdf65e976893d956d4e391cb7