Merge "Rename libz-host -> libz" am: 52e2821359 am: 4c1cccb5c4
am: 97828709f0

Change-Id: I593fd53509532c1dd1d032bdae9e3c0554eda355