Merge in 'armitage'.
Remove 'android-sdk'.

The Android SDK license forbids us from distributing it.