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

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

Change-Id: Ice0394b4e9696426e8d2ed22c3862ed13efb7d6f