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

Change-Id: I6451b822ba04cce7f28b863692cde6c7ce9b876c