Merge "zlib: changes so external/angle can reuse this copy of zlib." am: 4d02aae000 am: bfa589a94c am: 1c1e8aaa8d Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2359720 Change-Id: I83e1f017f283ec0101d83127a08ae9041e4cae4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>