Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Travis build file

Change-Id: I5f14e759a520e14f9d5d68cce80e2598c4473a6f
diff --git a/.travis.yml b/.travis.yml
index 3209482..783d1ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,23 +13,21 @@
 # limitations under the License.
 #
 
-dist: trusty
+dist: bionic
 sudo: required
 language: java
 
 matrix:
   include:
     - os: linux
-      jdk: oraclejdk8
-    - os: osx
-      osx_image: xcode8
+      jdk: oraclejdk11
 
 install: true
 
 before_install:
   - OS=linux
   - ARCH=x86_64
-  - V=0.11.0
+  - V=2.1.0
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OS=darwin; fi
   - GH_BASE="https://github.com/bazelbuild/bazel/releases/download/$V"
   - GH_ARTIFACT="bazel-$V-installer-$OS-$ARCH.sh"