diff --git a/.travis.yml b/.travis.yml
index c57a40b2..612507ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ script:
 android:
   components:
   - tools
-  - build-tools-24.0.2
+  - build-tools-24.0.3
   - android-24
   - extra-android-m2repository
 before_cache:
diff --git a/build.gradle b/build.gradle
index 92c603d5..c02fd47b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,11 +26,15 @@ buildscript {
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "24.0.2"
+    ext.androidBuildVersionTools = "24.0.3"
 }
 
 def androidCompileSdk() { return 24 }
 
+def androidTargetSdk() { return 24 }
+
+def androidMinSdk() { return 9 }
+
 subprojects {
     repositories {
         jcenter()
diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
index 972d5ad2..22155d2d 100644
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@@ -34,6 +34,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-api/src/main/AndroidManifest.xml b/play-services-api/src/main/AndroidManifest.xml
index 6e6ebf08..2dd201aa 100644
--- a/play-services-api/src/main/AndroidManifest.xml
+++ b/play-services-api/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.api">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.api"/>
diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle
index 8358b839..d916c320 100644
--- a/play-services-basement/build.gradle
+++ b/play-services-basement/build.gradle
@@ -39,6 +39,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-basement/src/main/AndroidManifest.xml b/play-services-basement/src/main/AndroidManifest.xml
index 3ea99c6e..6d382815 100644
--- a/play-services-basement/src/main/AndroidManifest.xml
+++ b/play-services-basement/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.basement">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.basement"/>
diff --git a/play-services-cast-api/build.gradle b/play-services-cast-api/build.gradle
index b4ddb5c3..dd3226e5 100644
--- a/play-services-cast-api/build.gradle
+++ b/play-services-cast-api/build.gradle
@@ -34,6 +34,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-cast-api/src/main/AndroidManifest.xml b/play-services-cast-api/src/main/AndroidManifest.xml
index 1aca1c4a..ad7313ae 100644
--- a/play-services-cast-api/src/main/AndroidManifest.xml
+++ b/play-services-cast-api/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.cast.api">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.cast.api"/>
diff --git a/play-services-cast-framework-api/build.gradle b/play-services-cast-framework-api/build.gradle
index b4ddb5c3..dd3226e5 100644
--- a/play-services-cast-framework-api/build.gradle
+++ b/play-services-cast-framework-api/build.gradle
@@ -34,6 +34,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-cast-framework-api/src/main/AndroidManifest.xml b/play-services-cast-framework-api/src/main/AndroidManifest.xml
index d4913c98..343e61e9 100644
--- a/play-services-cast-framework-api/src/main/AndroidManifest.xml
+++ b/play-services-cast-framework-api/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.cast.framework.api">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.cast.framework.api"/>
diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle
index b4ddb5c3..dd3226e5 100644
--- a/play-services-iid-api/build.gradle
+++ b/play-services-iid-api/build.gradle
@@ -34,6 +34,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-iid-api/src/main/AndroidManifest.xml b/play-services-iid-api/src/main/AndroidManifest.xml
index fa9ea1be..b3bcdc29 100644
--- a/play-services-iid-api/src/main/AndroidManifest.xml
+++ b/play-services-iid-api/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.iid.api">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.iid.api"/>
\ No newline at end of file
diff --git a/play-services-location-api/build.gradle b/play-services-location-api/build.gradle
index b4ddb5c3..dd3226e5 100644
--- a/play-services-location-api/build.gradle
+++ b/play-services-location-api/build.gradle
@@ -34,6 +34,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-location-api/src/main/AndroidManifest.xml b/play-services-location-api/src/main/AndroidManifest.xml
index 2439e26f..a50ca2d3 100644
--- a/play-services-location-api/src/main/AndroidManifest.xml
+++ b/play-services-location-api/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.location.api">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.location.api"/>
diff --git a/play-services-wearable-api/build.gradle b/play-services-wearable-api/build.gradle
index b4ddb5c3..dd3226e5 100644
--- a/play-services-wearable-api/build.gradle
+++ b/play-services-wearable-api/build.gradle
@@ -34,6 +34,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/play-services-wearable-api/src/main/AndroidManifest.xml b/play-services-wearable-api/src/main/AndroidManifest.xml
index 9ab8979d..deea7864 100644
--- a/play-services-wearable-api/src/main/AndroidManifest.xml
+++ b/play-services-wearable-api/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.wearable.api">
-
-    <uses-sdk android:minSdkVersion="9" />
-
-    <application />
-</manifest>
+<manifest package="org.microg.gms.wearable.api"/>