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

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

Change-Id: I63b84d60c1ebefa7d4cc4161112ba9735f873cf6