Merge branch 'stable-3.1' * stable-3.1: Upgrade bazlets to latest stable-3.1 to build with 3.1.3 API Change-Id: Icc3279a50286307e276f21b72e8886bad823a8ea