Fix zlib usage with TNG

Using zlib for TNG requires also that the the #include file can be
found, and this can be in a non-standard path. One part of this commit
should be rolled back into the TNG repo.

Change-Id: Iaa70ddd4f5471e405404148e6e83067d5ea52a27