diff --git a/.travis.yml b/.travis.yml
index 1b3be818..5b09d886 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,9 @@ script:
   - ./gradlew assembleDebug -x lint
 android:
   components:
-  - extra-android-m2repository
-  - build-tools-23.0.1
+  - tools
+  - build-tools-23.0.2
   - android-23
+  - extra-android-m2repository
 
 
diff --git a/extern/SafeParcel b/extern/SafeParcel
index 273f2e1f..4579b940 160000
--- a/extern/SafeParcel
+++ b/extern/SafeParcel
@@ -1 +1 @@
-Subproject commit 273f2e1f2bf972688831e6d6837bb6b607767966
+Subproject commit 4579b940f2aab6bc4be8607b20e0bbb70ab4002d
diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
index b5fa30b8..d7c9bc7b 100644
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@@ -32,7 +32,7 @@ version = '1.0-SNAPSHOT'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }