Merge pull request #7712 from DonLakeFlyer/TravisAndroid

Fix for android builds

.travis.yml

@@ -23,8 +23,7 @@ matrix:
           env: SPEC=linux-g++-64 CONFIG=debug
           services: xvfb
           sudo: required
-        - os: android
-          dist: trusty
+        - dist: trusty
           language: android
           env: SPEC=android-g++ CONFIG=installer
           sudo: false