Volkswagen has dropped its court battle with Suzuki over the GTi badge.