Upgrade to Android Studio 0.3.x and use gradle 0.6.+