diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 06ed571..e9ca91a 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -69,14 +69,9 @@
 LOCAL_MODULE := libjni_latinime_common_static
 LOCAL_MODULE_TAGS := optional
 
-# TODO: Remove this conditional block once we have no issues with building against NDK
-ifndef TARGET_BUILD_APPS # A full system image build
-include external/stlport/libstlport.mk
-else # An unbundled build
-LOCAL_NDK_VERSION := 7
+LOCAL_NDK_VERSION := 8
 LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := stlport_static
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 ######################################
@@ -98,14 +93,9 @@
 LOCAL_MODULE := libjni_latinime
 LOCAL_MODULE_TAGS := optional
 
-# TODO: Remove this conditional block once we have no issues with building against NDK
-ifndef TARGET_BUILD_APPS # A full system image build
-LOCAL_STATIC_LIBRARIES += libstlport_static
-else # An unbundled build
-LOCAL_NDK_VERSION := 7
+LOCAL_NDK_VERSION := 8
 LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := stlport_static
-endif
 
 include $(BUILD_SHARED_LIBRARY)