Android Studio 0.4.* build fixes