Gradle plugin: fix sourceSets for flavors (android)
Buildserver auto merge