Assault charge against Sheriff Trevino's son, dropped