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

Change-Id: I4547dc98fac208fd105663d6e61d7fa4ef6c4019