Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Fix genrule2 to clean up temporary folder content

Change-Id: I6589699e681ecae6e3b9d8443a1bc41b3d17715e
diff --git a/tools/genrule2.bzl b/tools/genrule2.bzl
index 3113022..d0b0969 100644
--- a/tools/genrule2.bzl
+++ b/tools/genrule2.bzl
@@ -21,6 +21,7 @@
         "ROOT=$$PWD",
         "TMP=$$(mktemp -d || mktemp -d -t bazel-tmp)",
         "(" + cmd + ")",
+        "rm -rf $$TMP",
     ])
     native.genrule(
         cmd = cmd,