Merge pull request #11641 from JosJuice/android-remove-old-config Android: Remove support for the old config system
