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

Change-Id: I00796f91c652b52e06c0130ed48d274b25ecdc6b