fixes to options and INI file; android builds successfully
android: toggle keyboard on menu key, not screen touch
moved android-specific mounts into INI file
Merge branch 'develop'