gitlab-ci: switch to 24 emulator to get some useful results

The emulator support seems to have totally melted down, so this is a step
back towards the old working setup.

.gitlab-ci.yml

@@ -70,8 +70,7 @@ errorprone:
     - ./gradlew connectedCheck || (adb -e logcat -d '*:E' > logcat.txt; exit 1)
 
 connected24:
-  only:
-    - fdroid/fdroidclient@master
+  retry: 1
   <<: *test-template
   variables:
     AVD_SDK: "24"
@@ -79,10 +78,6 @@ connected24:
     AVD_PACKAGE: "system-images;android-${AVD_SDK};${AVD_TAG};armeabi-v7a"
   <<: *connected-template
 
-connected25:
-  <<: *test-template
-  <<: *connected-template
-
 deploy_nightly:
   stage: deploy
   only: