Android 5.1.1 release 5
am 31f04ea9: (-s ours) Merge "Backport of fix for CVE-2015-0973 to libpng 1.2." into klp-dev

* commit '31f04ea98a96f6e88c2bcbf4b7e857edfd528c1e':
  Backport of fix for CVE-2015-0973 to libpng 1.2.