Merge "Rename libz-host -> libz" am: 3e47510e0e am: 7190974801
am: 77a00d2b67

Change-Id: Id9f42f47e16eb9193cc9f41ab095b8c37ec1d8f3