Update build configuration to support Android Studio Beta 0.8.1
Merge pull request #3 from foens/master

Update build configuration to support Android Studio Beta 0.8.1
Merge pull request #1 from antoniolg/master

Update from original