Merge branch 'stable-3.0'

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: Ia80e5ddc06faf7ec8b72db1a35d5a79f484c4d77