Merge branch 'stable-2.13'

* stable-2.13:
  Fix yet another null pointer exception

Change-Id: Id2b163aee90705c9359e6e5e5d2469e9224f9989

BUCK

diff --git a/BUCK b/BUCK
deleted file mode 100644
index 714abaf..0000000
--- a/BUCK
+++ /dev/null
@@ -1,11 +0,0 @@
-gerrit_plugin(
-  name = 'avatars-external',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/resources/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: avatars-external',
-    'Implementation-Title: External Avatar plugin',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/avatars-external',
-    'Gerrit-AvatarProvider: com.googlesource.gerrit.plugins.avatars.external.ExternalUrlAvatarProvider',
-  ],
-)

BUILD

diff --git a/BUILD b/BUILD
new file mode 100644
index 0000000..7dc8ff5
--- /dev/null
+++ b/BUILD
@@ -0,0 +1,13 @@
+load("//tools/bzl:plugin.bzl", "gerrit_plugin")
+
+gerrit_plugin(
+    name = "avatars-external",
+    srcs = glob(["src/main/java/**/*.java"]),
+    resources = glob(["src/main/resources/**/*"]),
+    manifest_entries = [
+        "Gerrit-PluginName: avatars-external",
+        "Implementation-Title: External Avatar plugin",
+        "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/avatars-external",
+        "Gerrit-AvatarProvider: com.googlesource.gerrit.plugins.avatars.external.ExternalUrlAvatarProvider",
+    ],
+)