am ec812a88: Merge "android: split private zlib into its own library"

* commit 'ec812a88794337b1730c89dc50f560e7caf0ddb7':
  android: split private zlib into its own library