Merge "external/zlib is now where the NDK headers come from." am: e3503c933a

Change-Id: Ia19c8202ed0c600020994c93a380eb5a06a0882f