Jonathan Majors' ex-girlfriend drops assault and defamation suit against actor