Romo, Giants avoid arbitration with deal