Updated to latest Android Studio