am f0c3b978: (-s ours) am 3574d98b: am 481d5259: (-s ours) Revert "Fix buffer overwrite in png_build_index" DO NOT MERGE

* commit 'f0c3b9786da1c3248cc8f71caf59a9684a4118ce':
  Revert "Fix buffer overwrite in png_build_index" DO NOT MERGE