Merge branch 'stable-3.3'

* stable-3.3:
  Upgrade bazlets to latest stable-3.3 to build with 3.3.4 API

Change-Id: I976cac2aca11362f49f3190252c403005b2a8357