Merge mozilla-inbound to mozilla-central. a=merge

layout/xul/nsRepeatService.h

@@ -12,6 +12,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsITimer.h"
+#include "nsString.h"
 
 #define INITAL_REPEAT_DELAY 250
 

taskcluster/scripts/misc/build-cbindgen.sh

@@ -2,7 +2,7 @@
 set -x -e -v
 
 # If you update this, make sure to update the minimum version in
-# build/moz.configure/rust.configure and python/mozboot/mozboot/osx.py as well.
+# build/moz.configure/rust.configure as well.
 CBINDGEN_VERSION=v0.6.7
 TARGET="$1"