Merge "Update zlib headers to 1.2.7."
am: 6a87cc9677

Change-Id: I486c8470c3ad7047c396a3df6d85dc2d87352bf3