Merge "Merge commit 'eaf99a4e2009b0e5759e6070ad1760ac1dd75461' into HEAD" am: 8a1222ce0c am: 6f18e0518c am: b16f596ea9 am: 266f7158c3

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

Change-Id: I30ba5c7d56e86163ada8aa279fe9788531cd5c46