Merge pull request #8803 from Ebola16/ANDROID Android: Android INI section and make platform tab selection an INI setting
