Merge "Include libz.a in the NDK."
am: 0d8ec3aa93

Change-Id: Ib7afd223f1ff3a674dae56cd1ecfd3a0938ab069