am 7dc6d60b: am b35ecf96: am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
* commit '7dc6d60b':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."