Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Documentation: Remove bazel issue
  Add an empty tools/BUILD file explicitly for Bazel

Change-Id: I3ed72e048c509f41c07f2deb3c47484c9370df93
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index 213ebe6..b69f2d7 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -50,15 +50,6 @@
   bazel build plugins/@PLUGIN@
 ```
 
-Note that due to a [known issue in Bazel][bazelissue], if the plugin
-has previously been built in standalone mode, it is necessary to clean
-the workspace before building in-tree:
-
-```
-  cd plugins/@PLUGIN@
-  bazel clean --expunge
-```
-
 The output is created in
 
 ```
@@ -79,4 +70,3 @@
 [Back to @PLUGIN@ documentation index][index]
 
 [index]: index.html
-[bazelissue]: https://github.com/bazelbuild/bazel/issues/2797
diff --git a/tools/BUILD b/tools/BUILD
new file mode 100644
index 0000000..1fa2160
--- /dev/null
+++ b/tools/BUILD
@@ -0,0 +1 @@
+# Empty file - bazel treat directories with BUILD file as a package
\ No newline at end of file