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

Change-Id: Ia01461497bee51f9edb8ef76238d5c532c4f4f97