Merge branch 'stable-3.1' * stable-3.1: Upgrade bazlets to latest stable-2.16 Change-Id: Ia9eae4d877137f1cc0b9595d764877c68bb92323