Use Sync FakeServer in Android tests via custom APK

chrome/android/sync_shell/javatests/AndroidManifest.xml

Index: chrome/android/sync_shell/javatests/AndroidManifest.xml
diff --git a/chrome/android/shell/javatests/AndroidManifest.xml b/chrome/android/sync_shell/javatests/AndroidManifest.xml
similarity index 89%
copy from chrome/android/shell/javatests/AndroidManifest.xml
copy to chrome/android/sync_shell/javatests/AndroidManifest.xml
index a9ed06d93bd738984f8e37d982fbd170e51da3ab..8b667809588fd278706fa8690567fd9566b02b5c 100644
--- a/chrome/android/shell/javatests/AndroidManifest.xml
+++ b/chrome/android/sync_shell/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.chrome.shell.tests">
+      package="org.chromium.chrome.sync_shell.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. -->
@@ -21,8 +21,8 @@
     </application>
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="20" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="org.chromium.chrome.shell"
-        android:label="Tests for org.chromium.chrome.shell"/>
+        android:targetPackage="org.chromium.chrome.sync_shell"
+        android:label="Tests for org.chromium.chrome.sync_shell"/>
     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
     <uses-permission android:name="android.permission.INJECT_EVENTS" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />