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

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

Change-Id: Ic67e326a814260b25281c753251c55a9020c906e