removing unnecessary functionality

Author: Plamen5kov

lib/services/android-project-service.ts

@@ -307,18 +307,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	}
 
 	public prepareProject(): IFuture<void> {
-		return (() => {
-			let resDestinationDir = this.getAppResourcesDestinationDirectoryPath().wait();
-			let androidManifestPath = path.join(resDestinationDir, this.platformData.configurationFileName);
-
-			// In case the file is not correct, looks like we are still using the default AndroidManifest.xml from runtime and the current file (in res dir)
-			// should be merged with it.
-			if (this.isAndroidManifestFileCorrect(androidManifestPath).wait()) {
-				// Delete the AndroidManifest.xml file from res directory as the runtime will consider it as addition to the one in src/main and will try to merge them.
-				// However now they are the same file.
-				this.$fs.deleteFile(androidManifestPath).wait();
-			}
-		}).future<void>()();
+		return Future.fromResult();
 	}
 
 	public ensureConfigurationFileInAppResources(): IFuture<void> {

lib/services/platform-service.ts

@@ -259,12 +259,6 @@ export class PlatformService implements IPlatformService {
 				sourceFiles = sourceFiles.filter(source => source.indexOf(testsFolderPath) === -1);
 			}
 
-			let hasTnsModulesInAppFolder = this.$fs.exists(path.join(appSourceDirectoryPath, constants.TNS_MODULES_FOLDER_NAME)).wait();
-			if (hasTnsModulesInAppFolder && this.$projectData.dependencies && this.$projectData.dependencies[constants.TNS_CORE_MODULES_NAME]) {
-				this.$logger.warn("You have tns_modules dir in your app folder and tns-core-modules in your package.json file. Tns_modules dir in your app folder will not be used and you can safely remove it.");
-				sourceFiles = sourceFiles.filter(source => !minimatch(source, `**/${constants.TNS_MODULES_FOLDER_NAME}/**`, { nocase: true }));
-			}
-
 			// verify .xml files are well-formed
 			this.$xmlValidator.validateXmlFiles(sourceFiles).wait();