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

Change-Id: Iebd4ad7523bb6e7eb8e51bf2c68b7c53a1250195