Unreviewed, fix the cairo build after r188594.