external/zlib is now where the NDK headers come from.

Test: builds
Exempt-From-Owner-Approval: OWNERS.android not working here for some reason
Change-Id: I3c30bd263604f0f360ab70c01e32ebd57c341df1
Merged-In: I3c30bd263604f0f360ab70c01e32ebd57c341df1