Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.6 API
  Move external dependencies to external_plugin_deps.bzl
  Upgrade bazlets to latest stable-3.0 to build with 3.0.10 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.21 API
  Upgrade bazlets to latest stable-2.15 to build with 2.15.19 API
  Convert File.NameKey to AutoValue
  Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API

Change-Id: Ib314440288b220abaf33b0884bf19f6a10798d83

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5c418ba..b1a0bd5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -22,21 +22,9 @@
 # Load release Plugin API
 gerrit_api()
 
-load("//tools/bzl:maven_jar.bzl", "GERRIT", "maven_jar")
+load("//:external_plugin_deps.bzl", "external_plugin_deps")
 
-AUTO_VALUE_VERSION = "1.7"
-
-maven_jar(
-    name = "auto-value",
-    artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
-    sha1 = "fe8387764ed19460eda4f106849c664f51c07121",
-)
-
-maven_jar(
-    name = "auto-value-annotations",
-    artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
-    sha1 = "5be124948ebdc7807df68207f35a0f23ce427f29",
-)
+external_plugin_deps()
 
 # Load snapshot Plugin API
 #gerrit_api_maven_local()

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
new file mode 100644
index 0000000..d574618
--- /dev/null
+++ b/external_plugin_deps.bzl
@@ -0,0 +1,16 @@
+load("//tools/bzl:maven_jar.bzl", "maven_jar")
+
+def external_plugin_deps():
+    AUTO_VALUE_VERSION = "1.7"
+
+    maven_jar(
+        name = "auto-value",
+        artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
+        sha1 = "fe8387764ed19460eda4f106849c664f51c07121",
+    )
+
+    maven_jar(
+        name = "auto-value-annotations",
+        artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
+        sha1 = "5be124948ebdc7807df68207f35a0f23ce427f29",
+    )