Merge "Enable libz on host bionic"
am: c8415eef09

Change-Id: Ia10b0ac5767a7a8cb6526cf045a3933085ff14a6