Merge "simpleperf: format inferno code." am: 504d653008 am: 03e42a04f0 am: 8173451339
am: c6bd131bf9

Change-Id: I89d477b07bb3b611a757e7544b7be66d5411f164