Support upgrade to Android Studio 0.6.1

Modify build.gradle with new gradle plugin version and build tools version
Merge branch 'upgrade-to-android-studio-0.6.1'