Enable components_browsertests on Android

components/test/android/browsertests_apk/AndroidManifest.xml.jinja2

Index: components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
similarity index 92%
copy from content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
copy to components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
index b76b29366fbbf50d6d3ab68174de25007783dcf3..ba09ccbb833961d046844059ac89a0fcf8602e98 100644
--- a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
+++ b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
@@ -7,11 +7,11 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.content_browsertests_apk">
+    package="org.chromium.components_browsertests_apk">
 
-    <application android:name="ContentBrowserTestsApplication"
-            android:label="ContentBrowserTests">
-        <activity android:name="ContentBrowserTestsActivity"
+    <application android:name="ComponentsBrowserTestsApplication"
+            android:label="ComponentsBrowserTests">
+        <activity android:name="ComponentsBrowserTestsActivity"
                   android:launchMode="singleTask"
                   android:theme="@android:style/Theme.Holo.Light.NoActionBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize"