Merge "update_zlib: Fix regex for detecting versions." am: 1fb88b556c
am: 3a0e9f89e1

Change-Id: I877f4d7739a6b7a3abceedc74335dd53212bf5c2