Merge change 1951 into donut

* changes:
  Expose the Zlib headers (<zlib.h> and <zconf.h>) in the android-1.5 NDK sysroot.