Merge "libz is back to LLNDK" into oc-mr1-dev