(Themaister backport) Add preliminary Android version