Merge "Don't ship updated zlib headers in the NDK."
am: c1c4c171a2

Change-Id: I541068b75c6eabf68cea8ba408b8caaf658023a3