diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index 94e3ecb..9f93515 100644
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -48,62 +48,6 @@
 	-Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
-ifdef TARGET_2ND_ARCH
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-else
-LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/sym
-endif
-else
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-endif
-LOCAL_MODULE := libEGL_swiftshader_vendor_debug
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
-LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
-LOCAL_CLANG := true
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
-LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-ifdef TARGET_2ND_ARCH
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-else
-LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/sym
-endif
-else
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-endif
-LOCAL_MODULE := libEGL_swiftshader_vendor_release
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
-LOCAL_CFLAGS += $(COMMON_CFLAGS) -DANGLE_DISABLE_TRACE
-LOCAL_CLANG := true
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
-LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libEGL_swiftshader
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 2ee4957..414fde4 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -68,68 +68,6 @@
 	-Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_debug
-ifdef TARGET_2ND_ARCH
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-else
-LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/sym
-endif
-else
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
-LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
-LOCAL_CLANG := true
-LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
-LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_release
-ifdef TARGET_2ND_ARCH
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-else
-LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/sym
-endif
-else
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
-LOCAL_CFLAGS += \
-	$(COMMON_CFLAGS) \
-	-fomit-frame-pointer \
-	-ffunction-sections \
-	-fdata-sections \
-	-DANGLE_DISABLE_TRACE
-LOCAL_CLANG := true
-LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
-LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libGLESv1_CM_swiftshader
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index f37f72c..9d75608 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -75,67 +75,6 @@
 	-Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libGLESv2_swiftshader_vendor_debug
-ifdef TARGET_2ND_ARCH
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-else
-LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/sym
-endif
-else
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
-LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
-LOCAL_CLANG := true
-LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += swiftshader_compiler_debug swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
-LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libGLESv2_swiftshader_vendor_release
-ifdef TARGET_2ND_ARCH
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-else
-LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/sym
-endif
-else
-LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
-LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
-LOCAL_CFLAGS += \
-	$(COMMON_CFLAGS) \
-	-fomit-frame-pointer \
-	-ffunction-sections \
-	-fdata-sections \
-	-DANGLE_DISABLE_TRACE
-LOCAL_CLANG := true
-LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += swiftshader_compiler_release swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
-LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libGLESv2_swiftshader
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)