Upgrade Gradle 2.1 / Android 0.13
Change package declaration