Merge changes I47a4ac34,I358ba65f into pi-dev

* changes:
  Use a separate map to store per app stats
  refactor bpf maps into class