Bug 1031267 - Fix --enable-system-cairo builds after they were broken by bug 1027763. r=jwatt