update to openssh 6.1p1

Change-Id: Ib997ef9c71c41c81e1a21ad79f4f1f7422a2126f
Fixes

* Fix merge fail.
* Bring sshd android config inline with sshd config.
* Other fixes.

Change-Id: I96fd2b2e74cbfb813d6d53b92cd5f2bcdd6cf781
sshd: add null check

* For some reason, privsep_pw->pw_passwd is null,
  and trying to run memset() and strlen() on that
  results in a segfault.
* Add a check for null to prevent that.

Change-Id: Ifd8edad787abf4fca481ccf6999bc2106027871a
start-ssh: use correct path for authorized_keys

* Also migrate keys from the old path.

Change-Id: I0810fe095a784cfb1c5fe2565068323e2679f2a9
Merge remote-tracking branch 'upstream/cm-10.1' into jb-mr1