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

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

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