Merge m-c and inbound.

b2g/components/Keyboard.jsm

@@ -56,6 +56,7 @@ let Keyboard = {
       }
     } else {
       mm.addMessageListener('Forms:Input', this);
+      mm.addMessageListener('Forms:SelectionChange', this);
 
       // When not running apps OOP, we need to load forms.js here since this
       // won't happen from dom/ipc/preload.js

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "4567d6a94813cf88067d466557debe720820828f", 
+    "revision": "94ed925b75d033a1e38577960143c8a627c76deb", 
     "repo_path": "/integration/gaia-central"
 }

dom/system/gonk/VolumeCommand.h

@@ -69,7 +69,13 @@ private:
                       nsACString& aResponseStr)
   {
     mResponseCode = aResponseCode;
+#ifdef ANDROID_VERSION >= 17
+    // There's a sequence number here that we don't care about
+    // We expect it to be 0. See VolumeCommand::SetCmd
+    mResponseStr = Substring(aResponseStr, 2);
+#else
     mResponseStr = aResponseStr;
+#endif
     if (mResponseCode >= ResponseCode::CommandOkay) {
       // This is a final response.
       mPending = false;
@@ -120,7 +126,13 @@ public:
 
   void SetCmd(const nsACString& aCommand)
   {
-    mCmd = aCommand;
+    mCmd.Truncate();
+#ifdef ANDROID_VERSION >= 17
+    // JB requires a sequence number at the beginning of messages.
+    // It doesn't matter what we use, so we use 0.
+    mCmd = "0 ";
+#endif
+    mCmd.Append(aCommand);
     // Add a null character. We want this to be included in the length since
     // vold uses it to determine the end of the command.
     mCmd.Append('\0');

python/mozbuild/mozbuild/mach_commands.py

@@ -70,7 +70,7 @@ class TerminalLoggingHandler(logging.Handler):
 
         try:
             if self.footer:
-                    self.footer.clear()
+                self.footer.clear()
 
             self.fh.write(msg)
             self.fh.write('\n')
@@ -208,12 +208,12 @@ class BuildOutputManager(LoggingMixin):
         self.t = terminal
         self.footer = BuildProgressFooter(terminal, monitor)
 
-        handler = TerminalLoggingHandler()
-        handler.setFormatter(log_manager.terminal_formatter)
-        handler.footer = self.footer
+        self.handler = TerminalLoggingHandler()
+        self.handler.setFormatter(log_manager.terminal_formatter)
+        self.handler.footer = self.footer
 
-        old = log_manager.replace_terminal_handler(handler)
-        handler.level = old.level
+        old = log_manager.replace_terminal_handler(self.handler)
+        self.handler.level = old.level
 
     def __enter__(self):
         return self
@@ -248,7 +248,13 @@ class BuildOutputManager(LoggingMixin):
         if relevant:
             self.log(logging.INFO, 'build_output', {'line': line}, '{line}')
         elif state_changed:
-            self.refresh()
+            # The lock acquisition was inserted in an attempt to isolate
+            # an I/O error 5. It may or may not actually make things better.
+            self.handler.acquire()
+            try:
+                self.refresh()
+            finally:
+                self.handler.release()
 
 
 @CommandProvider