Terror suspect surrenders in Yemen