Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Use Gerrit 2.16.22 in Dockerfile
  Upgrade bazlets to latest stable-2.16 to build with 2.16.22 API

Change-Id: I9d9b4791a689acaa462290cfd7ef12c2be32a720