Relanding "Add apk for running content_browsertests"

content/shell/android/javatests/AndroidManifest.xml

Index: content/shell/android/javatests/AndroidManifest.xml
diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell/android/javatests/AndroidManifest.xml
index fcd246568e780b60d142b4ae757557891fbffd15..3f27e60c81a1bfe6488c6c9e6ca0a241c9f61deb 100644
--- a/content/shell/android/javatests/AndroidManifest.xml
+++ b/content/shell/android/javatests/AndroidManifest.xml
@@ -5,7 +5,7 @@
   <!-- package name must be unique so suffix with "tests" so package loader
        doesn't ignore this. -->
   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.chromium.content_shell.tests">
+      package="org.chromium.content_shell_apk.tests">
     <!-- We add an application tag here just so that we can indicate that this
          package needs to link against the android.test library, which is
          needed when building test cases. -->
@@ -14,8 +14,8 @@
     </application>
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="org.chromium.content_shell"
-        android:label="Tests for org.chromium.content_shell"/>
+        android:targetPackage="org.chromium.content_shell_apk"
+        android:label="Tests for org.chromium.content_shell_apk"/>
     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
     <uses-permission android:name="android.permission.INJECT_EVENTS" />
 </manifest>