Ethiopia drops charges against rebel leader