Update android build tools.

servo · bors-servo · Apr 11, 2017 · Mar 13, 2017 · Mar 14, 2017 · d298017b5c23cca277aae020be6da3746d93c344
commit d298017b5c23cca277aae020be6da3746d93c344
diff --git a/servo-build-dependencies/android.sls b/servo-build-dependencies/android.sls
@@ -43,9 +43,9 @@ android-dependencies:
 android-sdk:
   archive.extracted:
     - name: {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}
-    - source: https://dl.google.com/android/android-sdk_{{ android.sdk.version }}-linux.tgz
+    - source: https://dl.google.com/android/repository/tools_{{ android.sdk.version }}-linux.zip
     - source_hash: sha512={{ android.sdk.sha512 }}
-    - archive_format: tar
+    - archive_format: zip
       # Workaround for https://github.com/saltstack/salt/pull/36552
     - archive_user: servo
     - user: servo

diff --git a/servo-build-dependencies/map.jinja b/servo-build-dependencies/map.jinja
@@ -1,10 +1,10 @@
 {%
   set android = {
-    'build_tools': '23.0.3',
-    'platform': '18',
+    'build_tools': '25.0.2',
+    'platform': '25',
     'sdk': {
-      'version': 'r24.4.1',
-      'sha512': '96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284'
+      'version': 'r25.2.3',
+      'sha512': 'dfc30ee3e2714cf8008ab1f99757deded002d21b23a8d2ab07952e1afd1c93124ddec06660babf6a46c54e5e7e135c8c0cb4cc512378a8509da074dbf7e253d7'
     },
     'ndk': {
       'version': 'r12b',