Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-2.16

Change-Id: I8238ec4c05e11629f8b6463c9f443494fd9e11d0