Merge "Merge tag 'elfutils-0.187' into master" am: abeb351ba1 am: 89a74820ad

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

Change-Id: Id2ffd84c79aa7a799868b0cb43b3e833104921c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>