Updated to latest version of Android Studio and gradle built system