Merge changes I55db8ff5,I8d73a876 into main am: 76a472ca35 am: e06fcd1b6f am: 3afddc9b31

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

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