Android N MR2 Preview 2
Merge "Fix zlib_example."