zlib: drop bits now upstream

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Merge pull request #321 from kergoth/layer-updates

Adjust for upstream layer updates