Merge branch 'stable-3.1'

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

Change-Id: I8c909bb1b7383fbdf4a4a1c3518b1c6741a6d290