Changes necessary for Android studio 0.4.0