[automerger skipped] Add __NR_bpf constant for i686. am: 6b0afa1c38
am: 589d4c4ca0 -s ours
am skip reason: change_id I5a8ade3a2292734001dd6e85f9c6b5cefc8de9c1 with SHA1 7993a85525 is in history

Change-Id: I8b33e9ca49701f68f055478b769eeee355f6cc35
tree: de1f6e56d8aee89570b9bd4fde9ba179dbd66fd2
  1. devicetree/
  2. net/
  3. Android.bp