Merge "Upgrade zlib to eb9ce8c993117f27ea0e5bccc0f2fee2a5323066" am: b0e91867e8 am: 486d6fa6b2 am: 770b37c5ee

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

Change-Id: Ia3f9b507d15e9c6128e936dbf9b8fce145d42ee7