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

Change-Id: I2a772003f74074841dd0f4fb3010c8075c907e5b