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

Change-Id: I2adbe1351286421d4859171a9a5555b16d6178c3