Merge "libpng: Upgrade to 1.6.26" am: 6e4f16bef1
am: c45d9f1df7

Change-Id: I22a3e0c16d378350a31f8876f519b70ad42023b3