am 174b8dcf: Merge "Split project templates into gradle/non-gradle" * commit '174b8dcf4407d4d33d66352d88766bca921cb602': Split project templates into gradle/non-gradle