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

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

Change-Id: Ib2ade004aa638fb60978c136b18da2254c6116b1