Merge pull request #7 from cartland/master

Update Gradle and SDK build tools