Unpack Tor binaries earlier to avoid issues with task order.

bramble-android/build.gradle

@@ -1,5 +1,3 @@
-import com.android.build.gradle.tasks.MergeResources
-
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
@@ -59,12 +57,11 @@ dependencies {
 	testImplementation "org.jmock:jmock-imposters:$jmock_version"
 }
 
-def torBinariesDir = 'src/main/res/raw'
 def torLibsDir = 'src/main/jniLibs'
 
 task cleanTorBinaries {
+	outputs.dir torLibsDir
 	doLast {
-		delete fileTree(torBinariesDir) { include '*.zip' }
 		delete fileTree(torLibsDir) { include '**/*.so' }
 	}
 }
@@ -72,6 +69,7 @@ task cleanTorBinaries {
 clean.dependsOn cleanTorBinaries
 
 task unpackTorBinaries {
+	outputs.dir torLibsDir
 	doLast {
 		configurations.tor.each { outer ->
 			zipTree(outer).each { inner ->
@@ -106,8 +104,4 @@ task unpackTorBinaries {
 	dependsOn cleanTorBinaries
 }
 
-tasks.withType(MergeResources) {
-	inputs.dir torBinariesDir
-	inputs.dir torLibsDir
-	dependsOn unpackTorBinaries
-}
+preBuild.dependsOn unpackTorBinaries