am 218df62d: Merge "Use no-zlib instead of LOCAL_CFLAGS filtering of -DZLIB"

* commit '218df62dd0a02db4bfe7bbeead2fe807e6ed7f7e':
  Use no-zlib instead of LOCAL_CFLAGS filtering of -DZLIB