Android 4.0.4 release 2.1
am 615c9ab0: (-s ours) Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE

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