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

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

Change-Id: Id6412f520b347a2c8d2be24112ac73f6e7ba4d9d