Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.9
  Bazel: Remove iteration over depset

Change-Id: Iba4b8d526791993028c0bbcae6e06c46f1354cb5
diff --git a/tools/junit.bzl b/tools/junit.bzl
index 4dfdb61..b4cd558 100644
--- a/tools/junit.bzl
+++ b/tools/junit.bzl
@@ -35,7 +35,7 @@
     return -1
 
 def _AsClassName(fname):
-    fname = [x.path for x in fname.files][0]
+    fname = [x.path for x in fname.files.to_list()][0]
     toks = fname[:-5].split("/")
     findex = -1
     for s in _PREFIXES: