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