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