Upgraded to support Android Studio 0.4.0