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

Change-Id: If8f2a330b042d383960fcde3779d697063fa632e