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

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

Change-Id: I6a5857dc95dd18b1fdc080e415dd47609399e43b