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

Change-Id: I0e510cc7ff8ffb35c2cf377172ef039d6543ff6b