backout (Bug 630473) - suspected as cause of a big Ts regression on Android 2.2

mobile/components/Makefile.in

@@ -52,7 +52,6 @@ XPIDLSRCS = \
         $(NULL)
 
 EXTRA_PP_COMPONENTS = \
-        MobileComponents.manifest \
         AboutRedirector.js \
         BrowserCLH.js \
         DirectoryProvider.js\
@@ -62,7 +61,7 @@ EXTRA_PP_COMPONENTS = \
         $(NULL)
 
 EXTRA_COMPONENTS = \
-        AlertsService.js \
+        MobileComponents.manifest \
         BrowserStartup.js \
         ContentPermissionPrompt.js \
         XPIDialogService.js \
@@ -81,6 +80,8 @@ ifdef MOZ_UPDATER
 EXTRA_COMPONENTS += UpdatePrompt.js
 endif
 
+EXTRA_COMPONENTS += AlertsService.js
+
 ifneq (Android,$(OS_TARGET))
 DIRS =  phone \
         $(NULL)

mobile/installer/package-manifest.in

@@ -615,7 +615,9 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/chrome/chrome.manifest
 @BINPATH@/components/AboutRedirector.js
 @BINPATH@/components/AddonUpdateService.js
+#ifndef ANDROID
 @BINPATH@/components/AlertsService.js
+#endif
 @BINPATH@/components/AutoCompleteCache.js
 @BINPATH@/components/BlocklistPrompt.js
 @BINPATH@/components/BrowserCLH.js