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

Change-Id: I4f1c60ab1d9c6b8e406463055cd808d59823a348