Gradle Plugin Release 1.5.0
Merge "Adapt to template API changes." into studio-master-dev