updated for android studio 0.4.0 and gradle plugin 0.7.1