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

Change-Id: I7f0e06eb60c63fbaf063ac00efe3611a0f8722fe