Merge branch 'stable-3.0'

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: If9c7b7d78c63b1a1d835588a52daf90be3c7b332