Merge pull request #7631 from RandomShaper/fix-android-module-res

Fix resources for Android modules not being merged (master)

platform/android/build.gradle.template

@@ -52,11 +52,10 @@ android {
 			java.srcDirs = ['src'
 				$$GRADLE_JAVA_DIRS$$
 			]
-			resources.srcDirs = [
+			res.srcDirs = [
 				'res'
 				$$GRADLE_RES_DIRS$$  
 			]
-			res.srcDirs = ['res']
 		//            libs.srcDirs = ['libs']
 			aidl.srcDirs = [
 				'aidl'