Merge pull request #6630 from lioncash/png CMakeLists: Don't dump libpng's includes into the top-level directory
