Merge "Clean up the zlib-related native code." into dalvik-dev