Merge branch 'stable-3.1' into 'stable-3.2' * stable-3.1: Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API Change-Id: I49064dd8e0bf8713511c6e029e4e68e26df72111