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