diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
index 40c32b639d1..9c8d2a1ee47 100644
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -255,7 +255,7 @@ class FlutterPlugin implements Plugin<Project> {
         if (project.hasProperty('preview-dart-2')) {
             previewDart2Value = project.property('preview-dart-2')
         }
-	
+
         Boolean strongModeValue = false
         if (project.hasProperty('strong')) {
             strongModeValue = project.property('strong')
@@ -295,7 +295,7 @@ class FlutterPlugin implements Plugin<Project> {
                 localEngineSrcPath this.localEngineSrcPath
                 targetPath target
                 previewDart2 previewDart2Value
-                strongMode strongModeValue	
+                strongMode strongModeValue
                 preferSharedLibrary preferSharedLibraryValue
                 sourceDir project.file(project.flutter.source)
                 intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}")
@@ -310,7 +310,7 @@ class FlutterPlugin implements Plugin<Project> {
                 localEngineSrcPath this.localEngineSrcPath
                 targetPath target
                 previewDart2 previewDart2Value
-                strongMode strongModeValue	
+                strongMode strongModeValue
                 preferSharedLibrary preferSharedLibraryValue
                 sourceDir project.file(project.flutter.source)
                 intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}")
@@ -321,6 +321,7 @@ class FlutterPlugin implements Plugin<Project> {
             Task copyFlxTask = project.tasks.create(name: "copyFlutterAssets${variant.name.capitalize()}", type: Copy) {
                 dependsOn flutterTask
                 dependsOn variant.mergeAssets
+                dependsOn "clean${variant.mergeAssets.name.capitalize()}"
                 into variant.mergeAssets.outputDir
                 with flutterTask.assets
             }
@@ -453,18 +454,20 @@ class FlutterTask extends BaseFlutterTask {
     CopySpec getAssets() {
         return project.copySpec {
             from "${intermediateDir}"
+
             include "flutter_assets/**" // the working dir and its files
+
             if (buildMode != 'debug') {
-	       if (preferSharedLibrary) {
-                  include "${intermediateDir}/app.so"
-	       } else {
-                  include "vm_snapshot_data"
-                  include "vm_snapshot_instr"
-                  include "isolate_snapshot_data"
-                  include "isolate_snapshot_instr"
-	       }
+                if (preferSharedLibrary) {
+                    include "${intermediateDir}/app.so"
+                } else {
+                    include "vm_snapshot_data"
+                    include "vm_snapshot_instr"
+                    include "isolate_snapshot_data"
+                    include "isolate_snapshot_instr"
+                }
             }
-      }
+        }
     }
 
     FileCollection readDependencies(File dependenciesFile) {