Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 2.2.0

Change-Id: I41aaadca56c0bd55758f1d241b23e32fae97ecb5