Don't declare WebView as a library.

We don't need to declare WebView as a library as we add its resources to
the asset manager dynamically rather than through a <uses-library> tag
in an application manifest. This also removes the need for it to be a
privileged application.

Bug: 11505352
Change-Id: Ief2f7a72a1068f51edf8842bd1d1c77dad7b23ca
(cherry picked from commit f3f92fd925e1a70e93e07850b8d5a8d0b5328e08)
diff --git a/chromium/Android.mk b/chromium/Android.mk
index 0577b67..ac2abf8 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -30,8 +30,6 @@
 
 LOCAL_MANIFEST_FILE := AndroidManifest.xml
 
-LOCAL_PRIVILEGED_MODULE := true
-
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES += android_webview_java_with_new_resources
diff --git a/chromium/AndroidManifest.xml b/chromium/AndroidManifest.xml
index b288959..ca4da4c 100644
--- a/chromium/AndroidManifest.xml
+++ b/chromium/AndroidManifest.xml
@@ -17,6 +17,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.webview">
     <application android:label="WebView Library">
-        <library android:name="com.android.webview" />
     </application>
 </manifest>
diff --git a/chromium/CleanSpec.mk b/chromium/CleanSpec.mk
index 221eb31..f76a96a 100644
--- a/chromium/CleanSpec.mk
+++ b/chromium/CleanSpec.mk
@@ -44,6 +44,7 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 $(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/webviewchromium.*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/webview)
 
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER