Updating code base for Gradle 1.10 and android studio > 0.5 support