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

Change-Id: Iec2791d1bd714e97abf7261629c46f8435473912