diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1391c1a..79e4ced 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -39,3 +39,5 @@
 # ************************************************
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/messaging)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/libgiftranscode.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/libgiftranscode.so)
diff --git a/jni/Android.mk b/jni/Android.mk
index cb9a69c..6b349a8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -32,4 +32,6 @@ LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-switch
 LOCAL_SDK_VERSION := 19
 LOCAL_NDK_STL_VARIANT := c++_static # LLVM libc++
 
+LOCAL_PRODUCT_MODULE := true
+
 include $(BUILD_SHARED_LIBRARY)