Move back to zlib 1.2.7 - Windows linking issue

Change-Id: I452619c40344a13d02b01af4cef356a361b97038
Merge branch 'zlib-down'

Change-Id: I5c264f326febee6f55001f8646e59782379a4567