Merge "Make libelf visible to libbpf-tools" am: 38fd201227 am: c3ccce0b14 am: d8c00f06ba

Original change: https://android-review.googlesource.com/c/platform/external/elfutils/+/1965994

Change-Id: If8133449ee544097197a1e29f8ce66e5e0497af6