diff --git a/gradle.properties b/gradle.properties
index 371870f473..35700c0a29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,8 @@ android.useAndroidX=true
 android.enableHiddenApiCheck=false
 android.hideApiWarning=false
 
+# Disabling this fail ASM Instrumentation.
+android.nonTransitiveRClass=true
 # Improve build performance by enabling R8 parallelism.
 android.r8.maxWorkers=4
 
diff --git a/wmshell/build.gradle b/wmshell/build.gradle
index 761033f7a3..427ff3120b 100644
--- a/wmshell/build.gradle
+++ b/wmshell/build.gradle
@@ -19,10 +19,9 @@ compileOnlyCommonJars()
 android {
     buildToolsVersion "36.1.0"
     namespace "com.android.wm.shell"
-    // Lawnchair-TODO-Build: IFocusTransitionListener$Default.class conflict from classes.jar and WM-Shell-16.jar
-//    buildFeatures {
-//        aidl true
-//    }
+    buildFeatures {
+        aidl true
+    }
     sourceSets {
         main {
             java.srcDirs = ['shared/src']