Merge "Continue using the legacy zlib headers."
am: f5da6805de

Change-Id: I5f233f26dbfef0a1d55824d65289b4275c8512f0