Merge "libz is back to LLNDK" into oc-mr1-dev am: d9d20baf6f
am: 8e14484166

Change-Id: I674dd17cf2cee08df3d2228a0b76c13a12e4493f