Merge branch 'stable-3.1' * stable-3.1: Bump required Bazel version to 2.1.0 Change-Id: Ib93c351ff2024b5584a0b2ccb6e844ef479e03f5