Got rid of circular dependency in gradle build.