Merge "Rename libz-host -> libz" am: 98b0d14797 am: d8a68223b1 am: 8e1f2377e3
am: cb584e1431

Change-Id: I154af8bca344b264bda409a56c87f30b56cdbd52