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: I5eb7a1405202710b8f64bccbfa647c6313819f62