Merge branch 'stable-3.1' * stable-3.1: Upgrade bazlets to latest stable-3.0 to build with 3.0.7 API Upgrade bazlets to latest stable-2.16 to build with 2.16.16 API Change-Id: Ifbb8210baa90cee63e1996f1b120fcdfe8a725d1