Merge "Fix zlib_example." am: dbad1188c3 am: f914b20d5c
am: be7336accb

Change-Id: Ic7555140f73c9baf15b29bca08c568fd14f625c5