Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab05b0a119b6441195e0bfd8ac32066584e4ff2e