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

Change-Id: If89115814856b306b7d00be89653305a1482e810