Merge branch 'riot' into 'master'

Update Riot to 0.6.10 (610)

Closes #749

See merge request !2306

metadata/im.vector.alpha.txt

@@ -179,6 +179,17 @@ Build:0.6.9,609
         sed -i -e '/projectDir/d' ../settings.gradle && \
         sed -i -e '/play-services/d' build.gradle
 
+Build:0.6.10,610
+    commit=f5860d676f06838ab7f128b04b474fc600642b6c
+    subdir=vector
+    gradle=appfdroid
+    srclibs=matrixsdk@e7f96b88b69c900e13e7125d8db114fcc796ab20
+    prebuild=cp -fR $$matrixsdk$$/matrix-sdk ../ && \
+        sed -i -e '/projectDir/d' ../settings.gradle && \
+        sed -i -e '/com.google.firebase/d' build.gradle && \
+        sed -i -e '/com.google.android.gms/d' build.gradle && \
+        sed -i -e '/com.google.gms.google-services/d' build.gradle
+
 Auto Update Mode:None
 Update Check Mode:HTTP
 Update Check Data:https://raw.githubusercontent.com/vector-im/riot-android/master/build.gradle|versionCodeProp = (.*)|.|versionNameProp = "(.*)"