Merge changes Ie8f964b5,I644650d7 am: be508084da

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

Change-Id: Ieef9602118d5afa007831783893f296de1cd0e7f