Android studio-1.5
Merge "Adapt to template API changes." into studio-master-dev