Upgrade to Gradle Android plugin 0:5:4