am 17b24482: Reconcile with gingerbread-release gingerbread-mr4-release

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