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

Change-Id: Ibe1d2cd98285a5a833a3240c7b2f7e9ef9378f6c