Merge branch 'stable-3.1' into master * stable-3.1: Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API Change-Id: I54715ecfc57b0c3b88886f0a40f91a1aaefc6297