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

Change-Id: I994e8fe6ebbd25dd57efd244f946250b3bb481fb