Merge "UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration"
am: 930fb65427

Change-Id: I9ed4398fea8f04415254b2b9bc5b0d9c76393238