Merge "Add NDK API modules for zlib." am: 164cac2513 am: 714a760762
am: d3709fe6bb

Change-Id: I9fd17a24710571b6cff34be0b151091036b67c83