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

Change-Id: Id53c5aa8a9b59eef8ef48e95265fe27ad176a07b