Merge "Upgrade zlib to 8bbd6c31" am: dac2e5b3

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



Change-Id: I2a88c14744abc6d1263446bcf31485a7ab276143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>