Merge "Rename libz-host -> libz" am: 98b0d14797 am: d8a68223b1
am: 8e1f2377e3

Change-Id: I32c879f199d300c53a524c2846bda183bd3479b7