Revert "android: split private zlib into its own library"

This reverts commit 7989f56658ba0ac8b2950f5aa1fae9aa4e4e6cbf.

Change-Id: I6d4956bbdb92268d504ad5dfecc02a753f99a6cb
3 files changed