Merge changes Ie5fa2605,Ia092e896

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