diff --git a/lib/AndroidManifest.xml b/lib/AndroidManifest.xml
index bc1f234..1bea627 100644
--- a/lib/AndroidManifest.xml
+++ b/lib/AndroidManifest.xml
@@ -3,8 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="18" />
+    <application />
 
 </manifest>
\ No newline at end of file
diff --git a/lib/build.gradle b/lib/build.gradle
index 070e6de..12dac15 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -5,8 +5,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion "18.0.1"
+    compileSdkVersion 19
+    buildToolsVersion "19"
 
     sourceSets {
         main {
@@ -19,8 +19,15 @@ android {
             assets.srcDirs = ['assets']
         }
 
+        // Move the tests to tests/java, tests/res, etc...
         instrumentTest.setRoot('tests')
 
+        // Move the build types to build-types/<type>
+        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+        // This moves them out of them default location under src/<type>/... which would
+        // conflict with src/ being used by the main source set.
+        // Adding new build types or product flavors should be accompanied
+        // by a similar customization.
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
     }
diff --git a/lib/project.properties b/lib/project.properties
index 484dab0..91d2b02 100644
--- a/lib/project.properties
+++ b/lib/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
 android.library=true