diff --git a/CleanSpec.mk b/CleanSpec.mk
index be13c30aa..98df622fa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinim
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_latinime.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/java/Android.bp b/java/Android.bp
index fbf27ceb0..f41e94af0 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -38,6 +38,8 @@ android_app {
     target_sdk_version: "23",
     sdk_version: "current",
 
+    product_specific: true,
+
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },
diff --git a/native/jni/Android.bp b/native/jni/Android.bp
index 9f7dbce47..5649fc1ea 100644
--- a/native/jni/Android.bp
+++ b/native/jni/Android.bp
@@ -105,6 +105,7 @@ filegroup {
 cc_library {
     name: "libjni_latinime",
     host_supported: true,
+    product_specific: true,
 
     sdk_version: "14",
     cflags: [