Merge "Rename libbpf to libbpf_bcc" am: e44ea016e1 am: 58b16bf395

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

Change-Id: Iefe26904a0e8ba5a20138dbaa65eb86221b41c13