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

Change-Id: I5256d828fb036ed6f4a2db3fddc5fb5bd8c0aea0