Merge "netd bpf: fix an error discovered by the next compiler update."