Update project

Misc project updates for latest Gradle 1.12 and Android Studio 0.6.0