Merge "simpleperf: move inferno to scripts directory." am: 0cffcbee0d
am: c71a4af252

Change-Id: I0c0e5cd874fa6a7185717a794807d95b2ebb478f