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