merge mozilla-central to autoland. r=merge a=merge

mobile/locales/l10n-changesets.json

@@ -1,4 +1,11 @@
 {
+    "ach": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "an": {
         "platforms": [
             "android", 
@@ -79,6 +86,13 @@
         ], 
         "revision": "default"
     }, 
+    "bs": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "ca": {
         "platforms": [
             "android", 
@@ -343,6 +357,13 @@
         ], 
         "revision": "default"
     }, 
+    "ia": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "id": {
         "platforms": [
             "android", 
@@ -431,6 +452,13 @@
         ], 
         "revision": "default"
     }, 
+    "ltg": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "lv": {
         "platforms": [
             "android", 
@@ -511,6 +539,13 @@
         ], 
         "revision": "default"
     }, 
+    "oc": {
+        "platforms": [
+            "android", 
+            "android-api-16"
+        ], 
+        "revision": "default"
+    }, 
     "or": {
         "platforms": [
             "android", 

testing/mozharness/scripts/desktop_unittest.py

@@ -674,7 +674,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
            Create the system-info.log artifact file, containing a variety of
            system information that might be useful in diagnosing test failures.
         """
-        import psutil
+        try:
+            import psutil
+        except:
+            return
         dir = self.query_abs_dirs()['abs_blob_upload_dir']
         self.mkdir_p(dir)
         path = os.path.join(dir, "system-info.log")