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

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

Change-Id: Ic435dd83c184f2b194dbf8c704fc8cd9f61d0f49