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

Change-Id: I7f89d4537ad3eb277196aa9899c046f178fd2d44