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