Merge "Always use our copy of libz"
am: d78df25e19

Change-Id: I48dfc1fac19774c51f69b089136111867e77aff3