Update to Android Studio 0.6.1 and SDK build tools 19.1
Merge remote-tracking branch 'origin/master'