Fixed an incompatibility with Android Studio 0.4.0.
Added code style changes.