Resolve merge conflicts.

# Conflicts:
#   briar-android/build.gradle
#   briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java

build.gradle

@@ -4,6 +4,9 @@ allprojects {
 	repositories {
 		jcenter()
 		mavenLocal()
+		maven {
+			url 'https://maven.google.com'
+		}
 	}
 }