Unreviewed attempt to fix Windows Cairo build after r239100.