Merge changes I9001f472,I324bee2b,I1a634839,I0663d474,I320ee9c2, ... am: 820f86f790 am: 21d650df05 am: df5daa1498 am: 32046a8287

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

Change-Id: I7d56ff3495a000a2628af526feb9303fa06f0646