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

Change-Id: I41a2e289b32b71cea520eadc6352d81616b36d2a