am bf601c7c: (-s ours) am 358907eb: (-s ours) am 3c3a7e1f: (-s ours) am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE

* commit 'bf601c7c40a31c3789a45128d217fab0ecc45115':
  Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE