Merge "UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration"