Merge branch 'stable-3.1'

* stable-3.1:
  Bump required Bazel version to 2.1.0

Change-Id: I585b45640163b2b85fecf1a091d3d9e853b7bb6b