Android O IOT Preview 6 (4475743)
Merge "Rename libz-host -> libz"
am: 98b0d14797

Change-Id: I8868dc6384de60b4eb7f72bfb427662cfa3f808a