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

Change-Id: I1e3323f7c2af3f837cd8ce80ced351bdaccf65fe