diff --git a/jni/Application.mk b/jni/Application.mk
index 7138c14c..0adb14a7 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -10,8 +10,6 @@ else
 APP_PLATFORM := android-9
 endif
 
-APP_STL := gnustl_static
-
 # if non-zero, works only if single ABI selected
 XASH_THREAD_NUM ?= 0
 
@@ -41,6 +39,7 @@ APP_ABI := x86 armeabi armeabi-v7a-hard
 
 APP_MODULES := xash menu client server NanoGL gpgs_support
 ifeq ($(GOOGLE_PLAY_BUILD),1)
+	APP_STL := gnustl_static
 	APP_MODULES += libgpg-1
 	CFLAGS_OPT += -DGOOGLE_PLAY_BUILD
 endif
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index d5db3fd8..4baf8e58 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit d5db3fd807075e21ea19bd99cf338fd829a1f921
+Subproject commit 4baf8e58a95255bda04ef6e03ec1d01665e80c4a