Merge "[libpng16] Revert ADLER32 error handling in pngrutil.c and pngpread.c."
am: b65760761b

Change-Id: I989053b622d9cca724cf6354e043729fdb2d78a1