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

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

Change-Id: I5f066c2a9cb3dee0ac37f51e55ad9fb30d41bace