Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 2.2.0

Change-Id: Ia81cdb1ccd7afd20f95cc11297f2c70032ccb323