Updates for Android Studio and changes to GMS

This update fixes minor issues that prevent building and Gradle sync in Android Studio.