The move to drop the lawsuit was announced in a one-page court filing by both companies in a Manhattan court, where they said they will drop their claims against each other