Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1360669 Change-Id: I72aae48ac01c06c4417934962ce0f54e59713fbb