Merge "libpng: Upgrade to 1.6.25"
am: c7ef736131

Change-Id: I5a79a4badb569a0c7ebceaa119c50007c98429e0