Merge "Upgrade zlib to 814da1f383b625955149c3845db62af3f29a4ffe" am: 457c92b855 am: 9db9402ccd am: 6833898932

Change-Id: I6dd5be6a5c7e3b89d474aab33b8f17a3a9048f07