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