Antoine Griezmann has rejoined Atletico Madrid on a permanent basis after Barcelona agreed to reduce the transfer fee from €40 million to €20m.