Merge "simpleperf: format inferno code."
am: 504d653008

Change-Id: I3fb3ca1ca306e58bfb720eadd12e0f6659c88b9d