Merge "Rename libz-host -> libz"
am: 944c4ea526

Change-Id: Id3d1dbbc8a12155de6d7f306a1a8c1acfaa77c96