Merge branch 'stable-2.16'

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

Change-Id: I0cebf9d5cd0af8a8904c66b23039fc5aaaee235b