Bug 933019, part 12 - Remove CopySurface. r=me