Merge "Stop exporting private "zutil.h" implementation detail."
am: ece4b39a7a

Change-Id: Ibf3e8474612295627b33440ca6a226b960a342f9