Merge branch 'stable-2.16'

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

Change-Id: I5850d40a9f8b9d4034b070be5826e4fe89cfe425