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