Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1eafa1de31 am: 4c22b0272b am: 393ead3e4a

Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8256ff9d183fcf0884f51549170e1eeaf5994a5e