Merge branch 'stable-3.1'

* stable-3.1:
  Bump required Bazel version to 2.1.0

Change-Id: If99cba18214c449a76d0ce09e493bb8dc3694d38