Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade buildifier to 0.22.0

Change-Id: I10adc0ebf8537b8489a832946cab5f9b740fe5a5
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index e3ab7ce..b106ac2 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.20.0).
+tool (version 0.22.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.