[automerger skipped] Merge "external/zlib is now where the NDK headers come from." am: e3503c933a am: d07292b7b0 -s ours am: 9b1e4af721 -s ours

am skip reason: Change-Id I3c30bd263604f0f360ab70c01e32ebd57c341df1 with SHA-1 5337a637b1 is in history

Change-Id: I6a2fef3c8f332f4cbd1b50d6ee5e0148f0c6b0d7