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