Merge "Rename libz-host -> libz"
am: f14c19b75c

Change-Id: Ia0518c8ad4b80472357c4cfe1c1c3e97de6b04cb