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