Merge "Upgrade zlib to 898c6c0dd91fa0efb38a10949f76102e42cc47f0" am: 28b8c108fa am: 2ac6e5bb34 am: 519d696077 am: cb982c85d1

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

Change-Id: I1a0ae10b8aef81426f986cffdd889a4ee91f9344