Merge "Check for bpf support at NetworkStatsService start" into pi-dev