Merge "Rename libz-host -> libz" am: 612b47630f am: b961c07f50 am: 3256982e9b
am: 29108720ce

Change-Id: Ic13dcb1987543fd8218119b419fa83ff48e3f057