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

Change-Id: I3646e56c8cc9c1a6134db38f5740d4698b266218