These templates were previously located in sdk.git but are actually embedded in sdk/platforms/android-n/templates so really they should be in development.git to avoid any multi-repo issue. Change-Id: I9b68f35572fa0c18001873854e1e60d2947dcb39
