Updating to work with Android Studio 1.0

@claywilkinson please review.