Added incubating classes from Gradle 2.0
Fix stupid import problem
Use copied incubating classes from Gradle 2.0