DO NOT MERGE Fix for CVE-2011-3026

Bug: 6085440

Note that this fix was borrowed from chromium and that the
issue was fixed in 1.2.47 of libpng (using a different approach).

Cherry pick from ccee121fae4c60a5dee6fce51195185694c376c3

Change-Id: I65f4ad400563f7e27ee73872f9c16f3ae4c8644d
1 file changed