Upgrade to Android Studio 0.6.1 (Gradle Plug-in 0.12) and SDK Build Tools 19.1
Merge remote-tracking branch 'origin/master'