Uneasy calm returns to Addis Ababa after riots