Merge "Upgrade zlib to 89bddfee9cf8fde3ab1212ed63bf03d76baf8914" am: 28320305b9

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

Change-Id: Idb84b59ed20a195e751f254368c66d0c521ea06f