Merge pull request #4433 from kumpera/android-fixes