Changes required for Android Studio 1.0

Android Studio 1.0 was complaining a lot about gradle. This seems to have quieted it down.