Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -4,7 +4,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-24.0.3
+    - build-tools-25.0.1
     - android-25
     - extra-android-support
     - extra-android-m2repository