Merge branch 'stable-3.2' into master * stable-3.2: Upgrade bazlets to latest stable-3.2 to build with 3.2.5.1 API Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API Change-Id: I0c43723f65eec019d75f11e96eb4baa862247fdf