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