Merge branch 'stable-3.1'

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

Change-Id: I668da4635c1cdff2e56b39acc3dbc17b427cb1ae