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