Merge "remove unneeded inclusions of libbpf_android" am: 0fc2ec6d68

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

Change-Id: I74d9611f27056e4d37dacfdd55d24fc6ee1d5480