Merge pull request #9010 from JosJuice/android-settingsadapter-redundant-static Android: Remove some static variables from SettingsAdapter
