--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -11,22 +11,31 @@
       >
     <uses-sdk android:minSdkVersion="@MOZ_ANDROID_MIN_SDK_VERSION@"
 #ifdef MOZ_ANDROID_MAX_SDK_VERSION
               android:maxSdkVersion="@MOZ_ANDROID_MAX_SDK_VERSION@"
 #endif
               android:targetSdkVersion="23"/>
 
 #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in
-#include ../services/manifests/SyncAndroidManifest_permissions.xml.in
 
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_permissions.xml.in
 #endif
 
+    <!-- A signature level permission specific to each Firefox version (Android
+         package name, e.g., org.mozilla.firefox).  Use this permission to
+         broadcast securely within a single Firefox version.  This needs to
+         agree with GlobalConstants.PER_ANDROID_PACKAGE_PERMISSION. -->
+    <permission
+        android:name="@ANDROID_PACKAGE_NAME@.permission.PER_ANDROID_PACKAGE"
+        android:protectionLevel="signature"/>
+
+    <uses-permission android:name="@ANDROID_PACKAGE_NAME@.permission.PER_ANDROID_PACKAGE" />
+
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
     <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
@@ -351,17 +360,16 @@
                  android:exported="false"
                  android:process="@MANGLED_ANDROID_PACKAGE_NAME@.Restarter">
         </service>
 
         <receiver android:name="org.mozilla.gecko.AlarmReceiver" >
         </receiver>
 
 #include ../services/manifests/FxAccountAndroidManifest_activities.xml.in
-#include ../services/manifests/SyncAndroidManifest_activities.xml.in
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_activities.xml.in
 #endif
 
 #if MOZ_CRASHREPORTER
   <activity android:name="org.mozilla.gecko.CrashReporter"
             android:process="@ANDROID_PACKAGE_NAME@.CrashReporter"
             android:label="@string/crash_reporter_title"
@@ -458,17 +466,16 @@
 
         <service
             android:exported="false"
             android:name="org.mozilla.gecko.dlc.DownloadContentService">
         </service>
 
 
 #include ../services/manifests/FxAccountAndroidManifest_services.xml.in
-#include ../services/manifests/SyncAndroidManifest_services.xml.in
 
         <service
             android:name="org.mozilla.gecko.tabqueue.TabReceivedService"
             android:exported="false" />
 
 
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_services.xml.in

--- a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
+++ b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
@@ -42,18 +42,16 @@ final class UnusedResourcesUtil {
     };
 
     public static final int[] USED_IN_MANIFEST = {
             R.drawable.search_launcher,
             R.xml.fxaccount_authenticator,
             R.xml.fxaccount_syncadapter,
             R.xml.search_widget_info,
             R.xml.searchable,
-            R.xml.sync_authenticator,
-            R.xml.sync_syncadapter,
     };
 
     public static final int[] USED_IN_SUGGESTEDSITES = {
             R.drawable.suggestedsites_amazon,
             R.drawable.suggestedsites_facebook,
             R.drawable.suggestedsites_twitter,
             R.drawable.suggestedsites_wikipedia,
             R.drawable.suggestedsites_youtube,

deleted file mode 100644
--- a/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
+++ /dev/null
@@ -1,75 +0,0 @@
-        <activity
-            android:theme="@style/SyncTheme"
-            android:icon="@drawable/icon"
-            android:label="@string/sync_app_name"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden"
-            android:taskAffinity="org.mozilla.gecko.sync.setup"
-            android:name="org.mozilla.gecko.sync.setup.activities.SetupSyncActivity" >
-            <!-- android:configChanges: SetupSyncActivity will handle orientation changes; no longer restarts activity (default) -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <!-- Adding a launcher will make Firefox Sync appear
-                     on the Apps screen, which we only want when testing. -->
-                <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
-            </intent-filter>
-        </activity>
-
-        <!-- On tablets, SyncTheme is in a dialog, which is not what
-             we want for install instructions. -->
-        <activity
-            android:theme="@style/Gecko"
-            android:name="org.mozilla.gecko.sync.setup.activities.WebViewActivity" />
-
-        <activity
-            android:theme="@style/SyncTheme"
-            android:clearTaskOnLaunch="true"
-            android:name="org.mozilla.gecko.sync.setup.activities.AccountActivity"
-            android:windowSoftInputMode="adjustResize|stateHidden"/>
-
-        <activity
-            android:theme="@style/SyncTheme"
-            android:clearTaskOnLaunch="true"
-            android:name="org.mozilla.gecko.sync.setup.activities.RedirectToSetupActivity"
-            android:windowSoftInputMode="adjustResize|stateHidden"/>
-
-        <!-- Secondary Sync activities. These depend on other activities for context
-             (display a result, or a next step). Since these don't make sense as stand-alone
-             activities, set excludeFromRecents="true" -->
-        <activity
-            android:theme="@style/SyncTheme"
-            android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:name="org.mozilla.gecko.sync.setup.activities.SetupFailureActivity" />
-
-        <activity
-            android:theme="@style/SyncTheme"
-            android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:name="org.mozilla.gecko.sync.setup.activities.SetupSuccessActivity" />
-
-        <activity
-            android:theme="@style/SyncTheme"
-            android:excludeFromRecents="true"
-            android:taskAffinity="org.mozilla.gecko.sync.setup"
-            android:name="org.mozilla.gecko.sync.config.activities.SelectEnginesActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-
-        <receiver
-            android:name="org.mozilla.gecko.sync.receivers.UpgradeReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <data android:scheme="package"/>
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="org.mozilla.gecko.sync.receivers.SyncAccountDeletedReceiver"
-            android:permission="@MOZ_ANDROID_SHARED_ACCOUNT_TYPE@.permission.PER_ACCOUNT_TYPE">
-            <intent-filter>
-                <action android:name="@MOZ_ANDROID_SHARED_ACCOUNT_TYPE@.accounts.SYNC_ACCOUNT_DELETED_ACTION"/>
-            </intent-filter>
-        </receiver>

deleted file mode 100644
--- a/mobile/android/services/manifests/SyncAndroidManifest_permissions.xml.in
+++ /dev/null
@@ -1,33 +0,0 @@
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-
-    <!-- A signature level permission granted only to the Firefox
-         versions sharing an Android Account type. -->
-    <permission
-        android:name="@MOZ_ANDROID_SHARED_ACCOUNT_TYPE@.permission.PER_ACCOUNT_TYPE"
-        android:protectionLevel="signature">
-    </permission>
-
-    <uses-permission android:name="@MOZ_ANDROID_SHARED_ACCOUNT_TYPE@.permission.PER_ACCOUNT_TYPE" />
-
-    <!-- A signature level permission specific to each Firefox version
-         (Android package name, e.g., org.mozilla.firefox).  Use this
-         permission to broadcast securely within a single Firefox
-         version.  This needs to agree with
-         GlobalConstants.PER_ANDROID_PACKAGE_PERMISSION.
-
-         This is not Sync-specific, but we don't have a better place
-         to put generic background service manifest snippets, so here
-         is expedient. -->
-    <permission
-        android:name="@ANDROID_PACKAGE_NAME@.permission.PER_ANDROID_PACKAGE"
-        android:protectionLevel="signature"/>
-
-    <uses-permission android:name="@ANDROID_PACKAGE_NAME@.permission.PER_ANDROID_PACKAGE" />

deleted file mode 100644
--- a/mobile/android/services/manifests/SyncAndroidManifest_services.xml.in
+++ /dev/null
@@ -1,26 +0,0 @@
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.sync.setup.SyncAuthenticatorService" >
-            <intent-filter >
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/sync_authenticator" />
-        </service>
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.sync.syncadapter.SyncService" >
-            <intent-filter >
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/sync_syncadapter" />
-        </service>
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.sync.receivers.SyncAccountDeletedService" >
-        </service>

deleted file mode 100644
--- a/mobile/android/services/src/main/res/xml/sync_authenticator.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/moz_android_shared_account_type"
-    android:icon="@drawable/icon"
-    android:smallIcon="@drawable/icon"
-    android:label="@string/sync_account_label"
-    android:accountPreferences="@xml/sync_options" />

deleted file mode 100644
--- a/mobile/android/services/src/main/res/xml/sync_options.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <PreferenceCategory
-    android:title="@string/sync_settings_options" />
-  <PreferenceScreen
-    android:key="sync_options"
-    android:title="@string/sync_title_pair"
-    android:summary="@string/sync_settings_summary_pair">
-    <intent
-      android:action="android.intent.action.MAIN"
-      android:targetPackage="@string/android_package_name"
-      android:targetClass="org.mozilla.gecko.sync.setup.activities.SetupSyncActivity">
-      <extra
-        android:name="isSetup"
-        android:value="false" />
-    </intent>
-  </PreferenceScreen>
-  <PreferenceScreen
-    android:key="sync_configure_engines"
-    android:title="@string/sync_configure_engines_title">
-    <intent
-      android:action="android.intent.action.MAIN"
-      android:targetPackage="@string/android_package_name"
-      android:targetClass="org.mozilla.gecko.sync.config.activities.SelectEnginesActivity">
-    </intent>
-  </PreferenceScreen>
-</PreferenceScreen>

deleted file mode 100644
--- a/mobile/android/services/src/main/res/xml/sync_syncadapter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="@string/content_authority_db_browser"
-    android:accountType="@string/moz_android_shared_account_type"
-    android:supportsUploading="true"
-    android:userVisible="true"
-/>