diff --git a/jni/Android.mk b/jni/Android.mk
index 2c90c1f98f..9e3a3733d7 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -16,6 +16,7 @@ COREFLAGS := -DCORE_NAME=\"$(EMUTYPE)\" \
   $(INCFLAGS) $(COMMONFLAGS) \
   -DHAVE_INET_ATON \
   -DHAVE_7ZIP -D_7ZIP_ST \
+  -DHAVE_CXX11 \
   -D_INTTYPES_H
 
 GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
diff --git a/jni/Application.mk b/jni/Application.mk
index 273789e08d..d9fa0ca012 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -7,4 +7,4 @@ APP_ABI := all
 # This should be investigated more in the future.
 APP_CFLAGS += -Wno-error=format-security -Ofast
 APP_STL := c++_static
-APP_PLATFORM := android-16
+APP_PLATFORM := android-21