Revert "aapt: fix unknown chunk handling"

This reverts commit e456fd11cba073e868a2cbd69359c4aaa47a237b.
Revert "aapt: update for libpng 1.6.3"

This reverts commit 35d49f3b94031d09b0c13e8ad5d31f71715bd0bb.
remove patch
Merge branch 'jb-devel-mr2-release' into jb-devel-mr2-staging