Bug 830270 - Follow-up: Land other piece. r=trivial

This landed with only some of the changes from the android-sync
repository present.

mobile/android/base/fxa/receivers/FxAccountDeletedService.java

@@ -7,6 +7,7 @@ package org.mozilla.gecko.fxa.receivers;
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.sync.config.AccountPickler;
+import org.mozilla.gecko.sync.repositories.android.FennecTabsRepository;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -58,6 +59,10 @@ public class FxAccountDeletedService extends IntentService {
     Logger.info(LOG_TAG, "Firefox account named " + accountName + " being removed; " +
         "deleting saved pickle file '" + FxAccountConstants.ACCOUNT_PICKLE_FILENAME + "'.");
     deletePickle(context);
+
+    // Delete client database and non-local tabs.
+    Logger.info(LOG_TAG, "Deleting the entire clients database and non-local tabs");
+    FennecTabsRepository.deleteNonLocalClientsAndTabs(context);
   }
 
   public static void deletePickle(final Context context) {

mobile/android/base/locales/en-US/sync_strings.dtd

@@ -212,8 +212,8 @@
 <!ENTITY fxaccount_account_type_label 'Firefox'>
 
 <!-- Localization note: these are shown by the Android system itself,
-     when the user navigates to the Android > Accounts > [Firefox
-     Account] Screen. The link takes the user to the Firefox Account
+     when the user navigates to the Android > Accounts > {Firefox
+     Account} Screen. The link takes the user to the Firefox Account
      status activity, which lets them manage their Firefox
      Account. -->
 <!ENTITY fxaccount_options_title '&syncBrand.shortName.label; Options'>