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