Merge pull request #12215 from JosJuice/android-si-devices Android: Add more GameCube controller types
