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