Merge "Remove libz-host module" am: dac11656c6 am: af243f2743
am: d22b7e4487

Change-Id: Ibb079feaee993b7ff34565e7215a3a294428c977