Merge branch 'stable-3.1' * stable-3.1: Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API Change-Id: I22b4393947f0421df3e0f641f0fcd6426fb6886d