Merge "Upgrade zlib to fa5dc475" am:...

Merge "Upgrade zlib to fa5dc475" am: 65ebc43f am: a0f4c02c am: 51e62667

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



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