Canonicalize all paths leading into zlib so that they are system
includs, then resort #include statements in the affected files.
Also clean up CMake inclusions of zlib so that there's only one,
and that it's a system include.

Change-Id: Ic5adef346f0f8a170ac30ee574eb67737aed92f0