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

Change-Id: I623c113a10f42dc83c766c04cb2f442157b540a1