Merge branch 'fp2-m-sibon' into branch 'prebuilts'

Sync diverging branches after erroneous cherry-pick on fp2-m-sibon.

Change-Id: If588fcbdf590f8ef5cd322062e87b353d0c20207
diff --git a/prebuilts/apk/com.fairphone.checkup-v20107-r2.1.7.apk b/prebuilts/apk/com.fairphone.checkup-v20108-r2.1.8.apk
similarity index 97%
rename from prebuilts/apk/com.fairphone.checkup-v20107-r2.1.7.apk
rename to prebuilts/apk/com.fairphone.checkup-v20108-r2.1.8.apk
index da5f455..b78f549 100644
--- a/prebuilts/apk/com.fairphone.checkup-v20107-r2.1.7.apk
+++ b/prebuilts/apk/com.fairphone.checkup-v20108-r2.1.8.apk
Binary files differ
diff --git a/prebuilts/apk/com.fairphone.checkup.apk b/prebuilts/apk/com.fairphone.checkup.apk
index d9bab62..7ce658e 120000
--- a/prebuilts/apk/com.fairphone.checkup.apk
+++ b/prebuilts/apk/com.fairphone.checkup.apk
@@ -1 +1 @@
-com.fairphone.checkup-v20107-r2.1.7.apk
\ No newline at end of file
+com.fairphone.checkup-v20108-r2.1.8.apk
\ No newline at end of file