Relanding "Add apk for running content_browsertests"

content/shell/android/browsertests_apk/AndroidManifest.xml

Index: content/shell/android/browsertests_apk/AndroidManifest.xml
diff --git a/content/shell/android/java/AndroidManifest.xml b/content/shell/android/browsertests_apk/AndroidManifest.xml
similarity index 94%
copy from content/shell/android/java/AndroidManifest.xml
copy to content/shell/android/browsertests_apk/AndroidManifest.xml
index cfeb0c4a426ee92123b23d1ee267fb5d2792ad07..5746a43d4174d0326216c5832f7f2ffb9d82aba3 100644
--- a/content/shell/android/java/AndroidManifest.xml
+++ b/content/shell/android/browsertests_apk/AndroidManifest.xml
@@ -7,14 +7,14 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.content_shell">
+    package="org.chromium.content_browsertests_apk">
 
     <permission android:name="org.chromium.content_shell.permission.SANDBOX"
             android:protectionLevel="signature" />
 
-    <application android:name="ContentShellApplication"
-            android:label="ContentShell">
-        <activity android:name="ContentShellActivity"
+    <application android:name="ContentBrowserTestsApplication"
+            android:label="ContentBrowserTests">
+        <activity android:name="ContentBrowserTestsActivity"
                   android:launchMode="singleTask"
                   android:theme="@android:style/Theme.Holo.Light.NoActionBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize"