Add prereq to clean out old SDK when upgrading

The SDK layout has changed due to the new packaging format,
so simply extracting the new archive over the old one will leave
extraneous files around.
To fix this, if we expect to make changes in the `archive.extracted`
state, then completely remove the existing version of the SDK.

Also, unlink the `current` symlink before making changes to an SDK
to avoid processes inadverently using the SDK while it is being changed
(the symlink will be restored once the SDK is done being updated.)

servo-build-dependencies/android.sls

@@ -55,6 +55,12 @@ android-dependencies:
       - pkg: pip
 
 {% for version, sdk in android.sdk.items() if version != 'current' %}
+android-sdk-{{ version }}-purge:
+  file.absent:
+    - name: {{ common.servo_home }}/android/sdk/{{ version }}
+    - prereq:
+      - archive: android-sdk-{{ version }}
+
 android-sdk-{{ version }}:
   archive.extracted:
     - name: {{ common.servo_home }}/android/sdk/{{ version }}
@@ -101,6 +107,14 @@ android-sdk-{{ version }}:
       - file: android-sdk-{{ version }}
 {% endfor %}
 
+android-sdk-current-unlink:
+  file.absent:
+    - name: {{ common.servo_home }}/android/sdk/current
+    - prereq:
+      - archive: android-sdk-{{ android.sdk.current }}
+    - require_in:
+      - file: android-sdk-{{ android.sdk.current }}-purge
+
 android-sdk-current:
   file.symlink:
     - name: {{ common.servo_home }}/android/sdk/current