Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Make build tool chain forward compatible

Change-Id: I3de1232c4657d60626d57bb74d872944edbe69e9
diff --git a/tools/maven_jar.bzl b/tools/maven_jar.bzl
index 4c045e6..c4cae43 100644
--- a/tools/maven_jar.bzl
+++ b/tools/maven_jar.bzl
@@ -148,7 +148,7 @@
     out = ctx.execute(args)
 
     if out.return_code:
-        fail("failed %s: %s" % (" ".join(args), out.stderr))
+        fail("failed %s: %s" % (args, out.stderr))
     _generate_build_file(ctx, "jar", binjar)
 
     if ctx.attr.src_sha1 or ctx.attr.attach_source: