Merge "Rename libz-host -> libz"
am: 52e2821359

Change-Id: I1d462077904d8303b763dae78b69f77b5eff6efa