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