Upgrade to android-gradle 0.4.2