Fixes

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

Change-Id: I96fd2b2e74cbfb813d6d53b92cd5f2bcdd6cf781
openssh: Use -fno-strict-aliasing

Use -fno-strict-aliasing here so we don't have to use it globally

Change-Id: I287dad0172866d9dcd49dd853204c28e593c3ce3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>