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

Change-Id: Ic474612cc1ce7ebd7243e7567ef9f6beca9cfeea