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

Change-Id: I66ea3e2be21adba601740775452a66f07036c5f1