Merge "remove unneeded inclusions of libbpf_android" am: 0fc2ec6d68 am: c4af7604bf am: 244579c40b am: f7df57b666

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

Change-Id: I5193493eb8093749e374dd773843921a9ce7ab87