Merge branch 'stable-3.1'

* stable-3.1:
  Bump required Bazel version to 2.1.0

Change-Id: I18ecc81953c6084a8828d8a29d93dd9be19c5fa7