Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set version to 2.15.15-SNAPSHOT
  Update buildifier to 0.26

Change-Id: I8036ae88c922f53a00582efc8f6c4b44a9954adf
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index 39c64708..2b5793b 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt
@@ -166,7 +166,7 @@
 link:https://github.com/google/google-java-format[`google-java-format`]
 tool (version 1.7), and to format Bazel BUILD, WORKSPACE and .bzl files the
 link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
-tool (version 0.22.0).
+tool (version 0.26.0).
 These tools automatically apply format according to the style guides; this
 streamlines code review by reducing the need for time-consuming, tedious,
 and contentious discussions about trivial issues like whitespace.