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