Separate the Android build stuff from the upstream zlib stuff.

Another step towards a script that does the zlib upgrades for us...

Change-Id: I940b5b4e79d2a8daf7a47129bbea7bdaffd4140c
234 files changed