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