Merge "Upgrade zlib to 09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e" am: 9d1908c2c5 am: ae82ee6917

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

Change-Id: I673a3002e7ee7cf2bf67ece7ca0dd36d3c70ab52