Merge "Update zlib headers to 1.2.7."