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

Change-Id: I6a493a5b1de178f98405203cad2d6e4f52431ff5