Changes to use the in-tree cairo