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

Change-Id: I356d824dcddf9c28676e61bc3f18c9910b9ec38f