Merge "Upgrade zlib to 9893e506b3a7ea4ec68e1fcd9a374e849945f405" am: 3811f797ba am: 41eafe1236 am: 79bdb15efb

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

Change-Id: Ic087b7220e697a796205b8b2d736ccfdda62e52d