Changes because I upgraded Android Studio to 0.3.0 and everything started to fail.

I don't know which ones are necessary.