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

Change-Id: I2138b148278d2bef6d0f6e58dc4b9f5c9b22526f