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

Change-Id: I0282975b70574947f6868a1efb43305f1d320f34