Update for zlib changes.
Fix the build for 10.1 and silence some warnings about 'useless' language parameters.
Merge branch 'jellybean-dev' of github.com:ProjectOpenCannibal/android_bootable_recovery into jellybean-dev