Merge "external/zlib is now where the NDK headers come from." into rvc-dev-plus-aosp am: 210a6fcac5

Change-Id: I8447381b35543a0c4f5460824b383ead9a12ab1e