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

Change-Id: I13d82beb6aa880836c1ffa8399cd298c0a69ecd6