Merge "Move Image/ImageChunk/PatchChunk declaration into header files"