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

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