Merge branch 'stable-3.1' * stable-3.1: Bump Bazel version to 2.2.0 Change-Id: I077fb35f38baf734e374d891ad6adce650ea138b