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