Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline"

* changes:
  Move socket tagging implementation to mainline.
  Move kernelToTag to NetworkStatsFactory.