Merge "Use libnetworkstats instead of libnetdbpf"