Upgrade to android-gradle 0.6.3