diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 702c22a858b8..73110305c4dd 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -173,7 +173,6 @@ android {
                 if (mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY) {
                     srcDir "${mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets"
                 }
-                srcDir "${topsrcdir}/mobile/android/app/assets"
             }
         }
 
diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build
index d0b8ea930d80..ba09d637519c 100644
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -19,12 +19,12 @@ with Files('mobile*'):
 with Files('ua-update.json.in'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
-with Files('assets/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'General')
-
 with Files('omnijar/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
 
+with Files('src/main/**'):
+    BUG_COMPONENT = ('Firefox for Android', 'General')
+
 with Files('src/androidTest/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Testing')
 
diff --git a/mobile/android/app/assets/example_asset.txt b/mobile/android/app/src/main/assets/example_asset.txt
similarity index 100%
rename from mobile/android/app/assets/example_asset.txt
rename to mobile/android/app/src/main/assets/example_asset.txt
diff --git a/mobile/android/app/assets/parental_controls_theme.png b/mobile/android/app/src/main/assets/parental_controls_theme.png
similarity index 100%
rename from mobile/android/app/assets/parental_controls_theme.png
rename to mobile/android/app/src/main/assets/parental_controls_theme.png
diff --git a/mobile/android/app/assets/publicsuffixlist b/mobile/android/app/src/main/assets/publicsuffixlist
similarity index 100%
rename from mobile/android/app/assets/publicsuffixlist
rename to mobile/android/app/src/main/assets/publicsuffixlist
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 8c4bc4646a70..7e00f5a14cf0 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1408,7 +1408,7 @@ ANDROID_GENERATED_RESFILES += [
 ]
 
 ANDROID_ASSETS_DIRS += [
-    '/mobile/android/app/assets',
+    '/mobile/android/app/src/main/assets',
 ]
 
 if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']: