Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.3 API

Change-Id: I3f03e23856014104e274f3f9333e01041caccfc0