Bug 684965 - update xpcshell manifests for Android; r=jmaher

dom/tests/unit/xpcshell.ini

@@ -6,3 +6,5 @@ tail =
 [test_bug465752.js]
 [test_domstorage_aboutpages.js]
 [test_geolocation_provider.js]
+# Bug 684962: test hangs consistently on Android
+skip-if = os == "android"

intl/uconv/tests/unit/xpcshell.ini

@@ -111,8 +111,6 @@ tail =
 [test_encode_CP852.js]
 [test_encode_CP855.js]
 [test_encode_CP857.js]
-# Bug 676958: test consistently hangs on Android
-skip-if = os == "android"
 [test_encode_CP862.js]
 [test_encode_CP864.js]
 [test_encode_CP874.js]

js/ductwork/debugger/tests/xpcshell.ini

@@ -3,3 +3,5 @@ head = head_dbg.js
 tail =
 
 [test_nativewrappers.js]
+# Bug 685068
+fail-if = os == "android"

toolkit/components/places/tests/expiration/xpcshell.ini

@@ -9,18 +9,10 @@ skip-if = os == "android"
 [test_annos_expire_never.js]
 [test_annos_expire_policy.js]
 [test_annos_expire_session.js]
-# Bug 676989: test fails consistently on Android
-fail-if = os == "android"
 [test_notifications.js]
-# Bug 676989: test fails consistently on Android
-fail-if = os == "android"
 [test_notifications_onDeleteURI.js]
 [test_notifications_onDeleteVisits.js]
 [test_pref_interval.js]
-# Bug 676989: test fails consistently on Android
-fail-if = os == "android"
 [test_pref_maxpages.js]
-# Bug 676989: test fails consistently on Android
-fail-if = os == "android" 
 [test_removeAllPages.js]
 [test_debug_expiration.js]

toolkit/components/places/tests/unit/xpcshell.ini

@@ -9,9 +9,13 @@ tail =
 skip-if = os == "android"
 [test_331487.js]
 [test_385397.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_399264_query_to_string.js]
 [test_399264_string_to_query.js]
 [test_399266.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_399606.js]
 [test_402799.js]
 [test_404630.js]
@@ -90,6 +94,8 @@ skip-if = os == "android"
 [test_markpageas.js]
 [test_moz-anno_favicon_mime_type.js]
 [test_multi_queries.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_multi_word_tags.js]
 [test_nsINavHistoryViewer.js]
 [test_null_interfaces.js]