Merge "Make full libbpf visible to libbpf-tools" am: 98d12069fe am: 4485e8a999 am: adb7afdac7

Original change: https://android-review.googlesource.com/c/platform/external/libbpf/+/1967162

Change-Id: Ib2b38b062ffbb648be4a9abdcfe63eb70930afc0