Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Bump Bazel version to 2.2.0 Change-Id: I45c01845de31ba0c831e7b7ecbde85dea70a4f8c