update to Gradle 2.1 and Android SDK 21