Update Gradle 2.1 and build tools 21.0.2