Merge branch 'stable-3.1' into master * stable-3.1: Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API Change-Id: I08ec4f97763ffdd8818c40f81a7223b992754eae