Merge "Upgrade zlib to 89bddfee9cf8fde3ab1212ed63bf03d76baf8914" am: 28320305b9 am: 05537a8139 am: 11a338ac8a

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

Change-Id: I8c291533d35384796394151b1581c7e513d16c34