Merge "bpf: move bpf_headers into /bpf subdirectory" into main am: 9bcff716f2 am: 62fe32b268

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3236918

Change-Id: Ief6c051aac9492a3d7fc5454e52866f0f15020a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>