Fixes

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

Change-Id: I96fd2b2e74cbfb813d6d53b92cd5f2bcdd6cf781