Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I5f66c4dc4828a80d556f6ef03157930d9f80cffb