Merge "simpleperf: fix runtest."
am: 2b29c4cea0

Change-Id: I386f50558456212a606af8a350df9189bc8047ba