Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I8ec9515a7f855760d3dca545ddadd7180f7d8011