Merge "Export zlib headers to musl sysroot" am: d77d8fb9 am: 2925aed7

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2076859



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