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