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

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

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