Ethiopia: Ex-Upper House speaker surrenders to gov't