Merge "remove libbpf_android_headers target" am: 7429fcb842

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1976929

Change-Id: I71748826874f6e715c80193d3830a337a60e034f