Merge "Rename libz-host -> libz" am: 612b47630f
am: b961c07f50

Change-Id: I8754646f115e124c726ece12bedd7d22287616dd