Merge "simpleperf: allow inferno to run from any dir." am: a9e5b352f6
am: e274d27f2a

Change-Id: I532819f154dfccfdc5eb8383c866155e045a3ef1