Update for zlib changes

Depends on http://review.cyanogenmod.org/#/c/37912/

Change-Id: I7d541813f520c3a3187f6c193e47b201cd220957
Merge branch 'cm-10.1' into martincz