Ethiopia, Eritrea swap charges in tense border row