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