Yet another travis adjustment

.travis.yml

@@ -13,21 +13,25 @@ env:
     - ADB_INSTALL_TIMEOUT=20
     - BUILD_TOOLS_VERSION=26.0.0
     - EMULATOR_SDK_LEVEL=25
+    - TAG=google_apis
     - TARGET_SDK_LEVEL=26
 
 android:
   components:
     - tools
     - platform-tools
+    - tools
     - build-tools-$BUILD_TOOLS_VERSION
     - android-EMULATOR_SDK_LEVEL
     - android-TARGET_SDK_LEVEL
+    - sys-img-armeabi-v7a-addon-google_apis-google-EMULATOR_SDK_LEVEL
+    - sys-img-armeabi-v7a-addon-google_apis-google-TARGET_SDK_LEVEL
     - extra-android-m2repository
     - extra-android-support
     - extra-google-m2repository
 
 before_script:
-  - echo no | android create avd --force -n test -t android-$EMULATOR_SDK_LEVEL --abi $ABI
+  - echo no | android create avd --force -n test -t android-$EMULATOR_SDK_LEVEL --abi $ABI -tag $TAG
   - emulator -avd test -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &