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

Change-Id: I6f89bd9c24ad4d559379ab45e4140076ab50761d