Merge changes Ie962ddd9,Ie7c0b11a

* changes:
  Use bpf data when available for single-UID cpu stats
  Use bpf data when available for per-UID cpu stats