Merge "Remove no-op SkGraphics::term() function."