Merge "Rename libz-host -> libz"
am: 3e47510e0e

Change-Id: Iff30621eddc356394617efcc8ced9dc4c9e85e8d