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