Ex-Gitmo detainee surrenders in Yemen