Merge "Rename libz-host -> libz"
am: 87575bdcae

Change-Id: Ib4cae59de2f7a004aef060d5d198cfd8de6fd7d7