Fixed Android Studio 0.4.0 compatibility issues.