Fix armv7a NDK arch string and SwelterResetAchievements include path

Author: Swelter Builder

game/client/SwelterResetAchievements.cpp

@@ -8,7 +8,7 @@ using namespace vgui;
 #include <vgui_controls/RadioButton.h>
 #include <vgui_controls/Slider.h>
 #include <vgui_controls/Button.h>
-#include <vgui_controls/Combobox.h>
+#include <vgui_controls/ComboBox.h>
 #include "ienginevgui.h"
 
 

scripts/build-android-armv7a-swelter.sh

@@ -7,4 +7,4 @@ if [ ! -d "android-ndk-r10e" ]; then
 fi
 export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/
 export NDK_HOME=$PWD/android-ndk-r10e/
-LINKFLAGS="-Wl,--strip-all" CXXFLAGS="-fexceptions" CFLAGS="-fexceptions" ./waf configure -T release --build-games=swelter --android=arm,4.9,21 --togles --disable-warns && ./waf build
+LINKFLAGS="-Wl,--strip-all" CXXFLAGS="-fexceptions" CFLAGS="-fexceptions" ./waf configure -T release --build-games=swelter --android=armeabi-v7a-hard,4.9,21 --togles --disable-warns && ./waf build