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

Change-Id: Ibee852bbf60def347020c6850a54b37825ea89db