Clean up deps for Android Studio 0.3.x+
Merge remote-tracking branch 'origin/master' into HEAD