Merge changes from topics "libz-no-stubs-for-vendor",...

Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3 am: e4be5409

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092



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