am 1e4498ad: Merge change 1951 into donut

Merge commit '1e4498ad17c6156ab40896d8f3307af8497b5327'

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