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

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

Change-Id: I72aae48ac01c06c4417934962ce0f54e59713fbb