Merge changes I55db8ff5,I8d73a876 into main am: 76a472ca35 am: 5d440fe870 am: 347c232289

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

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