Compatibility with Android Studio 0.5.1

The new version of Android Studio needs yet another update of the build files.