Merge "Upgrade zlib to 7492de9a52f656b070f41968e39a6efa603590d5" am: 89958eeb17 am: f1d1636fc4

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

Change-Id: I8019519ca31053205ba905008b97ab62b7bd2667