Gradle build fixes

Fixed some Gradle build issues that were introduced after moving to
Android Studio 1.0