Merge "zlib: build src/test/example.c" am: 46b4dab272
am: 22dc80586c

Change-Id: I4477fa18a60a62d4e088b2f6a9c41905a7d3afd5