FIX: [droid] (re-)fix sftp/ssh
Merge pull request #3469 from koying/fixdroidsftp

FIX: [droid] (re-)fix sftp/ssh