Update to build with Gradle 0.9 and Android Studio 0.5.x