DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ifde0e7dd0896f48be8975b153a07953bcea72656
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 5464a64..d1c6298 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,6 +49,7 @@
 $(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
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index ecadf45..0000000
--- a/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-# This project does not need new update?
-# Please update this list if you find better candidates.
-jeffbailey@google.com
-rtenneti@google.com
-delphij@google.com