Count updates were previously in 3 different places in the codebase,
and only updated when output_enabled was true. This patch moves them
all into update_stats and does some related cleanup.

Change-Id: I004774c1ffa2f1f0038e27bd04736d1e31701031