Convert the rest of these to Gradle Android plugin 0.9.0