Merge "libpng: Upgrade to 1.6.25" am: c7ef736131 am: a481d8aa5c
am: d8f25cf279

Change-Id: I15a1cb8f5ae97d10dbc964d7155ae66cdf0b7b72