Merge branch 'stable-3.0'

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I321940dbe1dc7dfb315cf7253d9e5980f77aa483