Merge "Make libelf visible to bpftool" am: 8ceef2e4ad am: 653c7f296c am: 6af4638e60

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

Change-Id: Ifdbf38e74f6ed71a59ce235fcce3a1269466f117