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

Change-Id: Ie70871fda66a9fe8caadfc1bf66efb03ef3859cb