Merge pull request #1967 from Sonicadvance1/Android_settings [Android] Change some configuration options.
