Merge "Include libz.a in the NDK." am: 0d8ec3aa93 am: d14e79874d Change-Id: Iee47ef27023b53d31b2653955beebdf5c79e10ba