Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  js.bzl: Stop using invalid join call

Change-Id: Ic5e854bcd24e0d8510d2afd93eed85cca2bec93e
diff --git a/tools/js.bzl b/tools/js.bzl
index bbae345..decb331 100644
--- a/tools/js.bzl
+++ b/tools/js.bzl
@@ -81,7 +81,7 @@
 
     out = ctx.execute(cmd)
     if out.return_code:
-        fail("failed %s: %s" % (" ".join(cmd), out.stderr))
+        fail("failed %s: %s" % (cmd, out.stderr))
 
     _bash(ctx, " && ".join([
         "TMP=$(mktemp -d || mktemp -d -t bazel-tmp)",
@@ -117,7 +117,7 @@
     cmd_list = ["bash", "-c", cmd]
     out = ctx.execute(cmd_list)
     if out.return_code:
-        fail("failed %s: %s" % (" ".join(cmd_list), out.stderr))
+        fail("failed %s: %s" % (cmd_list, out.stderr))
 
 bower_archive = repository_rule(
     _bower_archive,