Removed bundled cairo and pixman.

Commit licensed under MIT/X11.

reverted unintended change