Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 2.2.0

Change-Id: I279ebea62ab3241b1ad75e736ad9d556975ec2af