am 2ef2b5f9: Upgrade to zlib 1.2.5.

Merge commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f' into dalvik-dev

* commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f':
  Upgrade to zlib 1.2.5.