Merge "Revert "[libpng16] Revert ADLER32 error handling in pngrutil.c and pngpread.c."" am: 03e96d17ed
am: 631e6bb8f9

Change-Id: I173a6152df4448906e0f6dd936504ccf7b11e849