Merge branch 'stable-3.0'

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I1d2d0bbb8f013167e88b9efcae30b5a396f5b4b8