libz is back to LLNDK am: e58fa1b0c6
am: 3fc71ffaa3  -s ours

Change-Id: I6d632ddf3bde2781a031df6806fdd4caec7a423e