Merge branch 'stable-3.1' * stable-3.1: Align guice version with current gerrit core one Upgrade bazlets to latest stable-3.0 to build with 3.0.15 API Upgrade bazlets to latest stable-2.16 to build with 2.16.26 API Change-Id: I123de414391a28f54ab5b2f84780dd8060c40404