Merge "Always use our copy of libz" am: d78df25e19 am: f5dd447b3c
am: 3c0e5ab47f

Change-Id: I5f4d2fd26a032524131a1fab4e4da5446e077a6e