zlib: changes so external/angle can reuse this copy of zlib.

In particular, they need one of the extras in google/ that was otherwise
only used by tests.

Test: treehugger
Change-Id: Ie3ab377bf904726e41451f62a3ca2c8176f7f690