Merge pull request #10357 from JosJuice/android-main-debug Android: Make Main.Debug setting declarations match C++
