Final fixup before merge. Rebuild binary deps, minor fixes.

Binary deps were not getting build and cleaned from the binaryDeps
subdirectory of "libs". Also, reverted the android support appcompat
library target to android-19, as there was no need to change it.

F-Droid/ant-prepare.sh

@@ -41,7 +41,7 @@ android update lib-project --path $EXTERN/zxing-core
 android update lib-project --path $EXTERN/android-support-v4-preferencefragment
 place_support_v4 $EXTERN/android-support-v4-preferencefragment
 
-android update lib-project --path $EXTERN/Support/v7/appcompat --target android-21
+android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19
 place_support_v4 $EXTERN/Support/v7/appcompat
 
 android update project --path . --name F-Droid

F-Droid/build.gradle

@@ -92,7 +92,7 @@ task cleanBinaryDeps(type: Delete) {
     enabled = project.hasProperty('sourceDeps')
     description = "Removes all .jar and .aar files from F-Droid/libs/. Requires the sourceDeps property to be set (\"gradle -PsourceDeps cleanBinaryDeps\")"
 
-    delete fileTree('libs') {
+    delete fileTree('libs/binaryDeps') {
         include '*.aar'
         include '*.jar'
     }
@@ -113,13 +113,13 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
                 // 'MemorizingTrustManager/build/outputs/aar/MemorizingTrustManager-release.aar'
     }
 
-    into 'libs'
+    into 'libs/binaryDeps'
 
     includeEmptyDirs false
 
     eachFile { FileCopyDetails details ->
-        // Don't copy to a sub folder such as libs/Project/build/outputs/aar/project.aar, but
-        // rather libs/project.aar.
+        // Don't copy to a sub folder such as libs/binaryDeps/Project/build/outputs/aar/project.aar, but
+        // rather libs/binaryDeps/project.aar.
         details.path = details.name
     }