Merge changes from topic "elfutils-zstd" into main am: 7c7f2af329 am: 7ff5bdfa2a

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

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