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

Change-Id: I88fb5af48304653fa7489a79c921374be1da852d