Merge "Revert "Add default code reviewers into OWNERS""
diff --git a/Android.mk b/Android.mk
index 581462e..566b02e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,7 @@
 
 LOCAL_MODULE := webview
 LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
 LOCAL_MULTILIB := both
 LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
 LOCAL_REQUIRED_MODULES := \
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 9c16618..d1c6298 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,6 +46,10 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libwebviewchromium.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libwebviewchromium.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/app/webview)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/app/webview)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview)
 
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER