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

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

Change-Id: I4bb69e9c086b1a18dc6d8467460081a6b93178bc