Upgrade android plugin to stay compatible with latest Android Studio

// FREEBIE
Merge pull request #1581 from mcginty/android-studio-060

Upgrade android plugin to stay compatible with latest Android Studio