Explicitly use google-apis for android-25

Signed-off-by: Florian <[email protected]>

.travis.yml

@@ -5,8 +5,8 @@ env:
   - secure: fMBUkSsCBTw/U907w7Xm/yNzw4lq9yt7zFy0JyEZrA543LI7zQRIclIOtsDTUs0bwY+4KI08MNoYPLJ4TQhSJaH4wQ8b9C5TRsqXNfc0V718TcuYqSXqU6VPRVtX46/fCEWv/HAs0ksUKrHIlpWOwLPQpYDcKxwwlUndaakYKJ8=
   - ADB_INSTALL_TIMEOUT=8
   matrix:
-    - ANDROID_TARGET=android-22 ANDROID_ABI=armeabi-v7a
-    - ANDROID_TARGET=android-25 ANDROID_ABI=armeabi-v7a
+    - ANDROID_TARGET=android-22 ANDROID_ABI=armeabi-v7a SYS_IMG=sys-img-$ANDROID_ABI-$ANDROID_TARGET
+    - ANDROID_TARGET=android-25 ANDROID_ABI=google_apis/armeabi-v7a SYS_IMG=sys-img-armeabi-v7a-google_apis-25
 
 before_cache:
 - cd ${TRAVIS_BUILD_DIR}/gradle/caches/
@@ -31,7 +31,7 @@ android:
   - extra-google-m2repository
   - extra-android-m2repository
   - $ANDROID_TARGET
-  - sys-img-$ANDROID_ABI-$ANDROID_TARGET
+  - $SYS_IMG
 
 install:
 - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
@@ -44,7 +44,7 @@ before_script:
 - android list device
 - android list target
 - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -d "5.4in FWVGA"
-- emulator -avd test -no-window &
+- emulator -avd test -engine classic -no-window &
 - android-wait-for-emulator
 - adb shell input keyevent 82 &