Updated to support Android Studio 0.5.2