Hopefullt fix build.  Track CM Zlib

Once again this is a clean merge from AOSP master, so losing nothing by using CM's

Change-Id: I7692b8a363880777818e60a355f58a17db4f66be