Remove cruft from our zlib-1.2.6 import.

There was a ton of cruft lying around from earlier versions. I want to move us
to be as close to upstream as possible, so upgrades are simpler and quicker,
and I can be more confident of what I'm doing. This is a first step.

Change-Id: I526a64969ff2a5bf25067fae4530560acf095225
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
Upgrade to zlib 1.2.7.

Also add a script that's the culmination of my recent fiddling around with
the layout of this project: you can now run "update_zlib.sh" to upgrade to
the latest zlib release. My work here is done.

Change-Id: I76006233ec41ad1528023c8b1926964870785aa2
Initial empty repository
No-op - skip bad commit

Change-Id: I183623f0e16bc79e79efe4aece42acfb1d6cc07a
Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
am 2d5094f0: Retire LOCAL_NDK_VERSION.

* commit '2d5094f0ebcb01fb9f11952d776945b090d89cf0':
  Retire LOCAL_NDK_VERSION.
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1

Conflicts:
	Android.mk
	Makefile
	ThirdPartyProject.prop
	old/Makefile.emx
	src/CMakeLists.txt
	src/ChangeLog
	src/Makefile.in
	src/README
	src/as400/compile.clp
	src/as400/readme.txt
	src/as400/zlib.inc
	src/configure
	src/contrib/delphi/ZLib.pas
	src/contrib/dotzlib/DotZLib/UnitTests.cs
	src/contrib/infback9/inftree9.c
	src/contrib/minizip/configure.ac
	src/contrib/pascal/zlibpas.pas
	src/contrib/vstudio/readme.txt
	src/contrib/vstudio/vc10/zlib.rc
	src/contrib/vstudio/vc10/zlibvc.def
	src/contrib/vstudio/vc9/zlib.rc
	src/contrib/vstudio/vc9/zlibvc.def
	src/deflate.c
	src/gzlib.c
	src/gzread.c
	src/inflate.c
	src/inftrees.c
	src/make_vms.com
	src/old/Makefile.emx
	src/qnx/package.qpg
	src/treebuild.xml
	src/win32/README-WIN32.txt
	src/zconf.h
	src/zconf.h.cmakein
	src/zconf.h.in
	src/zlib.3
	src/zlib.pc
	win32/Makefile.emx
	zconf.h
	zlib.3.pdf
	zlib.h
	zutil.h

Change-Id: Ief70ab10922811797fb962522e48e840b7dec037