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