Merge "Add libpng include path"