Merge "Update libpng 1.6.22beta" into nyc-dev
am: a93ad0b928

* commit 'a93ad0b9285470d089c574c70588bda575d19f81':
  Update libpng 1.6.22beta