Merge "inferno: remove misleading thread count and id in one-flamegraph."
am: 3cae82904f

Change-Id: I2b339d666ce0989e420e5a72db9ec6e40a5d7325