openssh-x11-jdk: export JAVA_HOME and PATH properly

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
android-sdk: add image

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
Merge branch 'feature/jdk-fix-path' into develop
Merge branch 'feature/android-sdk' into develop