Merge pull request #3584 from sigmabeta/android-settings-text-fix [Android] Change SettingsActivity label to "Settings" instead of "CPU Settings"
