Update to latest version of Gradle Plugin / Android SDK; modify project structure so that it can be imported by AS.