Giants bring back 2 key starting pitchers