Bug 1031267 - Fix system cairo builds after bug 1027763. r=jwatt,a=kwierso