diff --git a/engine/src/flutter/libs/minikin/Android.mk b/engine/src/flutter/libs/minikin/Android.mk
index 386dc2bee1c..60a46efcf97 100644
--- a/engine/src/flutter/libs/minikin/Android.mk
+++ b/engine/src/flutter/libs/minikin/Android.mk
@@ -15,7 +15,6 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 
 LOCAL_SRC_FILES := \
     AnalyzeStyle.cpp \
@@ -43,7 +42,6 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libpng \
     libz \
-    libstlport \
     libicuuc \
     libutils
 
diff --git a/engine/src/flutter/libs/minikin/Layout.cpp b/engine/src/flutter/libs/minikin/Layout.cpp
index fcae6cc51df..fa7770138c0 100644
--- a/engine/src/flutter/libs/minikin/Layout.cpp
+++ b/engine/src/flutter/libs/minikin/Layout.cpp
@@ -17,12 +17,14 @@
 #define LOG_TAG "Minikin"
 #include <cutils/log.h>
 
-#include <string>
-#include <vector>
+#include <math.h>
+#include <stdio.h>  // for debugging
+
 #include <algorithm>
 #include <fstream>
 #include <iostream>  // for debugging
-#include <stdio.h>  // ditto
+#include <string>
+#include <vector>
 
 #include <utils/JenkinsHash.h>
 #include <utils/LruCache.h>
diff --git a/engine/src/flutter/sample/Android.mk b/engine/src/flutter/sample/Android.mk
index ec06e3852ae..101a413cae4 100644
--- a/engine/src/flutter/sample/Android.mk
+++ b/engine/src/flutter/sample/Android.mk
@@ -15,7 +15,6 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 
 LOCAL_MODULE_TAGS := tests
 
@@ -31,7 +30,6 @@ LOCAL_SHARED_LIBRARIES += \
 	libutils \
 	liblog \
 	libcutils \
-	libstlport \
 	libharfbuzz_ng \
 	libicuuc \
 	libft2 \
@@ -45,7 +43,6 @@ include $(BUILD_EXECUTABLE)
 
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 
 LOCAL_MODULE_TAG := tests
 
@@ -63,7 +60,6 @@ LOCAL_SHARED_LIBRARIES += \
 	libutils \
 	liblog \
 	libcutils \
-	libstlport \
 	libharfbuzz_ng \
 	libicuuc \
 	libskia \