Merge "Remove libz-host module"
am: dac11656c6

Change-Id: Iebc4c94cc2042044d1c7d81df286c96115532c97