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: Ia207810c5b756941a26b6eb60692b910c62fd169