Merge "Rename libz-host -> libz" am: 772123003e
am: d12c507abf

Change-Id: I016a43ec6d61eeeb4183c2f96b7899688f76b29a