Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Add an empty tools/BUILD file explicitly for Bazel

Change-Id: I4381c4df778ff9613ad43b833d8ed7fcb3648357

tools/BUILD

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