diff --git a/app/build.gradle b/app/build.gradle
index 3f2b4c29..b2a76cf4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,11 +100,16 @@ preBuild.doLast {
 }
 
 // To produce these binaries, in latest AOSP source tree, run
-// $ make
+// $ m
 def aospDeps = fileTree(include: [
-        // out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar
+        // For more information about this module:
+        // https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-11.0.0_r3/Android.bp#507
+        // framework_intermediates/classes-header.jar works for gradle build as well,
+        // but not unit tests, so we use the actual classes (without updatable modules).
+        //
+        // out/target/common/obj/JAVA_LIBRARIES/framework-minus-apex_intermediates/classes.jar
         'android.jar',
-        // out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar
+        // out/target/common/obj/JAVA_LIBRARIES/core-libart.com.android.art.release_intermediates/classes.jar
         'libcore.jar'
 ], dir: 'libs')
 
diff --git a/app/libs/android.jar b/app/libs/android.jar
index 229339b8..8e479c1f 100644
Binary files a/app/libs/android.jar and b/app/libs/android.jar differ
diff --git a/app/libs/libcore.jar b/app/libs/libcore.jar
index a6a26551..c79b11f5 100644
Binary files a/app/libs/libcore.jar and b/app/libs/libcore.jar differ