diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 693a612..99f026c 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -15,13 +15,17 @@
 
 PIXELFLINGER_SRC_FILES += \
     codeflinger/CodeCache.cpp \
-    codeflinger/tinyutils/SharedBuffer.cpp \
-    codeflinger/tinyutils/VectorImpl.cpp \
     format.cpp \
     clear.cpp \
     raster.cpp \
     buffer.cpp
 
+ifneq ($(wildcard system/core/libpixelflinger/codeflinger/tinyutils/VectorImpl.cpp),)
+    PIXELFLINGER_SRC_FILES += \
+        codeflinger/tinyutils/SharedBuffer.cpp \
+        codeflinger/tinyutils/VectorImpl.cpp
+endif
+
 ifneq ($(TW_HAVE_X86_ACCELERATED_PIXELFLINGER),true)
 PIXELFLINGER_SRC_FILES += \
 	codeflinger/ARMAssemblerInterface.cpp \
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 5daa888..01225c3 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -121,7 +121,7 @@
 endif
 
 LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
-LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libjpeg libpng
+LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libjpeg libpng libutils
 LOCAL_STATIC_LIBRARIES += libpixelflinger_twrp
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libminuitwrp