Android O IOT Preview 7 (4635859)
Merge "Include libz.a in the NDK."