Merge "netd.c: Simplify bpf_owner_match"