Merge pull request #9170 from JosJuice/android-extension-hack-2 Android: Remove hacks for Wii Remote extension setting, round 2
