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

* commit 'b35ecf96a37ac31d04032836fc09d4f2c85a7e64':
  Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."