Merge "Revert "libpng: Upgrade to 1.6.26"" am: 51e126759e am: a5355dcbe7
am: d8b64fce3d

Change-Id: Id6b8e4036ad4b4cffebce035ac76c166fd12dc76