Merge changes Ie8f964b5,I644650d7 am: be508084da am: 5180e87dcc am: 932e0584e2 am: 4e2923b29b

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

Change-Id: I2669107424a390798672aa0beb6e4c9a09bffcb1