--- a/taskcluster/ci/android-stuff/kind.yml
+++ b/taskcluster/ci/android-stuff/kind.yml
@@ -166,17 +166,19 @@ jobs:
         optimizations:
           - - files-changed
             - - "mobile/android/**/*.java"
               - "mobile/android/**/*.jpeg"
               - "mobile/android/**/*.jpg"
               - "mobile/android/**/*.png"
               - "mobile/android/**/*.svg"
               - "mobile/android/**/*.xml" # Manifest & android resources
-              - "mobile/android/**/build.gradle"
+              - "mobile/android/**/*.gradle"
+              - "mobile/android/**/Makefile.in"
+              - "mobile/android/**/moz.build"
 
     android-checkstyle:
         description: "Android checkstyle"
         attributes:
             build_platform: android-checkstyle
             build_type: opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
@@ -215,18 +217,20 @@ jobs:
               - "bin/build.sh"
             max-run-time: 36000
         scopes:
           - docker-worker:relengapi-proxy:tooltool.download.internal
           - docker-worker:relengapi-proxy:tooltool.download.public
         optimizations:
           - - files-changed
             - - "mobile/android/**/checkstyle.xml"
+              - "mobile/android/**/*.java"
               - "mobile/android/**/*.gradle"
-              - "mobile/android/**/*.java"
+              - "mobile/android/**/Makefile.in"
+              - "mobile/android/**/moz.build"
 
     android-findbugs:
         description: "Android findbugs"
         attributes:
             build_platform: android-findbugs
             build_type: opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
@@ -264,10 +268,12 @@ jobs:
               - "/bin/bash"
               - "bin/build.sh"
             max-run-time: 36000
         scopes:
           - docker-worker:relengapi-proxy:tooltool.download.internal
           - docker-worker:relengapi-proxy:tooltool.download.public
         optimizations:
           - - files-changed
-            - - "mobile/android/**/*.gradle"
-              - "mobile/android/**/*.java"
+            - - "mobile/android/**/*.java"
+              - "mobile/android/**/*.gradle"
+              - "mobile/android/**/Makefile.in"
+              - "mobile/android/**/moz.build"