Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  Include gerrit.war in api_{install,deploy}

Change-Id: I7c4b47f1023b9db24d7742e3cf56d5b734184188
diff --git a/tools/build.defs b/tools/build.defs
index 4bb48ea..af39c2a 100644
--- a/tools/build.defs
+++ b/tools/build.defs
@@ -78,7 +78,7 @@
     visibility = visibility,
   )
 
-def gerrit_war(name, ui = 'ui_optdbg', context = [], docs = False):
+def gerrit_war(name, ui = 'ui_optdbg', context = [], docs = False, visibility = []):
   war(
     name = name,
     libs = LIBS + ['//gerrit-war:version'],
@@ -89,4 +89,5 @@
       '//gerrit-gwtui:' + ui + '.zip',
     ] + context,
     docs = docs,
+    visibility = visibility,
   )