Merge "inferno: Show both event count and percentage in flamegraph." am: 94e617d19d
am: fb61dbe17f

Change-Id: Ic403616202537d05bad2327ed4e49ad88c76ef8a